summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a1bus/a1bus.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp2
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp2
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp5
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp2
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp3
-rw-r--r--src/devices/bus/a2bus/a2bus.cpp4
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp4
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp2
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp4
-rw-r--r--src/devices/bus/a2bus/a2diskiing.cpp2
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp3
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp4
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp3
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp2
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp2
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp2
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp2
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp7
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp4
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp2
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp7
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp2
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp3
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp2
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp2
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp2
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp2
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp2
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp2
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp5
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp13
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp4
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp2
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp2
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp2
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp6
-rw-r--r--src/devices/bus/a2bus/laser128.cpp2
-rw-r--r--src/devices/bus/a2bus/mouse.cpp2
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp3
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h2
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp2
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp2
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp2
-rw-r--r--src/devices/bus/a7800/a78_slot.cpp2
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp7
-rw-r--r--src/devices/bus/a7800/hiscore.cpp2
-rw-r--r--src/devices/bus/a7800/rom.cpp31
-rw-r--r--src/devices/bus/a7800/xboard.cpp5
-rw-r--r--src/devices/bus/a800/a800_slot.cpp6
-rw-r--r--src/devices/bus/a800/a8sio.cpp4
-rw-r--r--src/devices/bus/a800/cassette.cpp2
-rw-r--r--src/devices/bus/a800/oss.cpp8
-rw-r--r--src/devices/bus/a800/rom.cpp20
-rw-r--r--src/devices/bus/a800/sparta.cpp2
-rw-r--r--src/devices/bus/abcbus/abc890.cpp12
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp2
-rw-r--r--src/devices/bus/abcbus/abcbus.h10
-rw-r--r--src/devices/bus/abcbus/fd2.cpp2
-rw-r--r--src/devices/bus/abcbus/hdc.cpp2
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp2
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp12
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp2
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp2
-rw-r--r--src/devices/bus/abcbus/memcard.cpp2
-rw-r--r--src/devices/bus/abcbus/ram.cpp2
-rw-r--r--src/devices/bus/abcbus/sio.cpp2
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp2
-rw-r--r--src/devices/bus/abcbus/turbo.cpp2
-rw-r--r--src/devices/bus/abcbus/uni800.cpp2
-rw-r--r--src/devices/bus/abckb/abc77.cpp5
-rw-r--r--src/devices/bus/abckb/abc77.h12
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp2
-rw-r--r--src/devices/bus/abckb/abc99.cpp3
-rw-r--r--src/devices/bus/abckb/abc99.h12
-rw-r--r--src/devices/bus/abckb/abckb.cpp2
-rw-r--r--src/devices/bus/adam/adamlink.cpp2
-rw-r--r--src/devices/bus/adam/exp.cpp2
-rw-r--r--src/devices/bus/adam/ide.cpp2
-rw-r--r--src/devices/bus/adam/ram.cpp2
-rw-r--r--src/devices/bus/adamnet/adamnet.cpp4
-rw-r--r--src/devices/bus/adamnet/ddp.cpp2
-rw-r--r--src/devices/bus/adamnet/fdc.cpp2
-rw-r--r--src/devices/bus/adamnet/kb.cpp2
-rw-r--r--src/devices/bus/adamnet/printer.cpp2
-rw-r--r--src/devices/bus/adamnet/spi.cpp2
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp2
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp20
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp6
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp6
-rw-r--r--src/devices/bus/apf/rom.cpp6
-rw-r--r--src/devices/bus/apf/slot.cpp2
-rw-r--r--src/devices/bus/apricot/expansion/expansion.cpp4
-rw-r--r--src/devices/bus/apricot/expansion/ram.cpp6
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp2
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.cpp2
-rw-r--r--src/devices/bus/arcadia/rom.cpp4
-rw-r--r--src/devices/bus/arcadia/slot.cpp2
-rw-r--r--src/devices/bus/astrocde/exp.cpp2
-rw-r--r--src/devices/bus/astrocde/ram.cpp12
-rw-r--r--src/devices/bus/astrocde/rom.cpp6
-rw-r--r--src/devices/bus/astrocde/slot.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp2
-rw-r--r--src/devices/bus/bbc/analogue/analogue.cpp2
-rw-r--r--src/devices/bus/bbc/analogue/joystick.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/fdc.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp4
-rw-r--r--src/devices/bus/bbc/joyport/joyport.cpp2
-rw-r--r--src/devices/bus/bbc/joyport/joystick.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp2
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp2
-rw-r--r--src/devices/bus/bml3/bml3bus.cpp4
-rw-r--r--src/devices/bus/bml3/bml3kanji.cpp2
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp2
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp2
-rw-r--r--src/devices/bus/bw2/exp.cpp2
-rw-r--r--src/devices/bus/bw2/ramcard.cpp2
-rw-r--r--src/devices/bus/c64/16kb.cpp2
-rw-r--r--src/devices/bus/c64/4dxh.cpp2
-rw-r--r--src/devices/bus/c64/4ksa.cpp2
-rw-r--r--src/devices/bus/c64/4tba.cpp2
-rw-r--r--src/devices/bus/c64/bn1541.cpp2
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp2
-rw-r--r--src/devices/bus/c64/c128_partner.cpp2
-rw-r--r--src/devices/bus/c64/comal80.cpp2
-rw-r--r--src/devices/bus/c64/cpm.cpp2
-rw-r--r--src/devices/bus/c64/currah_speech.cpp3
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp2
-rw-r--r--src/devices/bus/c64/dinamic.cpp2
-rw-r--r--src/devices/bus/c64/dqbb.cpp2
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp2
-rw-r--r--src/devices/bus/c64/easyflash.cpp2
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp2
-rw-r--r--src/devices/bus/c64/exos.cpp2
-rw-r--r--src/devices/bus/c64/exp.cpp2
-rw-r--r--src/devices/bus/c64/fcc.cpp2
-rw-r--r--src/devices/bus/c64/final.cpp2
-rw-r--r--src/devices/bus/c64/final3.cpp2
-rw-r--r--src/devices/bus/c64/fun_play.cpp2
-rw-r--r--src/devices/bus/c64/geocable.cpp2
-rw-r--r--src/devices/bus/c64/georam.cpp2
-rw-r--r--src/devices/bus/c64/ide64.cpp2
-rw-r--r--src/devices/bus/c64/ieee488.cpp2
-rw-r--r--src/devices/bus/c64/kingsoft.cpp2
-rw-r--r--src/devices/bus/c64/mach5.cpp2
-rw-r--r--src/devices/bus/c64/magic_desk.cpp2
-rw-r--r--src/devices/bus/c64/magic_formel.cpp2
-rw-r--r--src/devices/bus/c64/magic_voice.cpp3
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp2
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp2
-rw-r--r--src/devices/bus/c64/midi_passport.cpp2
-rw-r--r--src/devices/bus/c64/midi_sci.cpp2
-rw-r--r--src/devices/bus/c64/midi_siel.cpp2
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp2
-rw-r--r--src/devices/bus/c64/multiscreen.cpp2
-rw-r--r--src/devices/bus/c64/music64.cpp2
-rw-r--r--src/devices/bus/c64/neoram.cpp2
-rw-r--r--src/devices/bus/c64/ocean.cpp2
-rw-r--r--src/devices/bus/c64/pagefox.cpp2
-rw-r--r--src/devices/bus/c64/partner.cpp2
-rw-r--r--src/devices/bus/c64/prophet64.cpp2
-rw-r--r--src/devices/bus/c64/ps64.cpp2
-rw-r--r--src/devices/bus/c64/reu.cpp6
-rw-r--r--src/devices/bus/c64/rex.cpp2
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp2
-rw-r--r--src/devices/bus/c64/ross.cpp2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp3
-rw-r--r--src/devices/bus/c64/silverrock.cpp2
-rw-r--r--src/devices/bus/c64/simons_basic.cpp2
-rw-r--r--src/devices/bus/c64/speakeasy.cpp3
-rw-r--r--src/devices/bus/c64/stardos.cpp2
-rw-r--r--src/devices/bus/c64/std.cpp2
-rw-r--r--src/devices/bus/c64/structured_basic.cpp2
-rw-r--r--src/devices/bus/c64/super_explode.cpp2
-rw-r--r--src/devices/bus/c64/super_games.cpp2
-rw-r--r--src/devices/bus/c64/supercpu.cpp2
-rw-r--r--src/devices/bus/c64/sw8k.cpp2
-rw-r--r--src/devices/bus/c64/swiftlink.cpp2
-rw-r--r--src/devices/bus/c64/system3.cpp2
-rw-r--r--src/devices/bus/c64/tdos.cpp2
-rw-r--r--src/devices/bus/c64/turbo232.cpp2
-rw-r--r--src/devices/bus/c64/vizastar.cpp2
-rw-r--r--src/devices/bus/c64/vw64.cpp2
-rw-r--r--src/devices/bus/c64/warp_speed.cpp2
-rw-r--r--src/devices/bus/c64/westermann.cpp2
-rw-r--r--src/devices/bus/c64/xl80.cpp3
-rw-r--r--src/devices/bus/c64/zaxxon.cpp2
-rw-r--r--src/devices/bus/cbm2/24k.cpp2
-rw-r--r--src/devices/bus/cbm2/exp.cpp2
-rw-r--r--src/devices/bus/cbm2/hrg.cpp5
-rw-r--r--src/devices/bus/cbm2/std.cpp2
-rw-r--r--src/devices/bus/cbm2/user.cpp2
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp24
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp8
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp4
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp2
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp4
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp2
-rw-r--r--src/devices/bus/centronics/covox.cpp5
-rw-r--r--src/devices/bus/centronics/ctronics.cpp2
-rw-r--r--src/devices/bus/centronics/digiblst.cpp3
-rw-r--r--src/devices/bus/centronics/dsjoy.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp3
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp3
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp6
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp2
-rw-r--r--src/devices/bus/centronics/printer.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp2
-rw-r--r--src/devices/bus/chanf/rom.cpp12
-rw-r--r--src/devices/bus/chanf/slot.cpp2
-rw-r--r--src/devices/bus/coco/coco_232.cpp2
-rw-r--r--src/devices/bus/coco/coco_dwsock.cpp2
-rw-r--r--src/devices/bus/coco/coco_dwsock.h8
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp8
-rw-r--r--src/devices/bus/coco/coco_multi.cpp2
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp5
-rw-r--r--src/devices/bus/coco/coco_pak.cpp4
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp2
-rw-r--r--src/devices/bus/coco/cococart.cpp2
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp4
-rw-r--r--src/devices/bus/coleco/ctrl.cpp2
-rw-r--r--src/devices/bus/coleco/exp.cpp2
-rw-r--r--src/devices/bus/coleco/hand.cpp2
-rw-r--r--src/devices/bus/coleco/sac.cpp2
-rw-r--r--src/devices/bus/coleco/std.cpp2
-rw-r--r--src/devices/bus/coleco/xin1.cpp2
-rw-r--r--src/devices/bus/compis/graphics.cpp2
-rw-r--r--src/devices/bus/compis/hrg.cpp5
-rw-r--r--src/devices/bus/compucolor/floppy.cpp4
-rw-r--r--src/devices/bus/comx35/clm.cpp3
-rw-r--r--src/devices/bus/comx35/eprom.cpp2
-rw-r--r--src/devices/bus/comx35/exp.cpp2
-rw-r--r--src/devices/bus/comx35/expbox.cpp2
-rw-r--r--src/devices/bus/comx35/fdc.cpp2
-rw-r--r--src/devices/bus/comx35/joycard.cpp2
-rw-r--r--src/devices/bus/comx35/printer.cpp2
-rw-r--r--src/devices/bus/comx35/ram.cpp2
-rw-r--r--src/devices/bus/comx35/thermal.cpp2
-rw-r--r--src/devices/bus/cpc/amdrum.cpp4
-rw-r--r--src/devices/bus/cpc/brunword4.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp4
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp4
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp7
-rw-r--r--src/devices/bus/cpc/cpcexp.cpp2
-rw-r--r--src/devices/bus/cpc/ddi1.cpp2
-rw-r--r--src/devices/bus/cpc/doubler.cpp2
-rw-r--r--src/devices/bus/cpc/hd20.cpp2
-rw-r--r--src/devices/bus/cpc/magicsound.cpp5
-rw-r--r--src/devices/bus/cpc/mface2.cpp2
-rw-r--r--src/devices/bus/cpc/playcity.cpp5
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp2
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp2
-rw-r--r--src/devices/bus/cpc/transtape.cpp2
-rw-r--r--src/devices/bus/crvision/rom.cpp14
-rw-r--r--src/devices/bus/crvision/slot.cpp2
-rw-r--r--src/devices/bus/dmv/dmvbus.cpp2
-rw-r--r--src/devices/bus/dmv/k210.cpp2
-rw-r--r--src/devices/bus/dmv/k220.cpp2
-rw-r--r--src/devices/bus/dmv/k230.cpp8
-rw-r--r--src/devices/bus/dmv/k233.cpp2
-rw-r--r--src/devices/bus/dmv/k801.cpp8
-rw-r--r--src/devices/bus/dmv/k803.cpp2
-rw-r--r--src/devices/bus/dmv/k806.cpp2
-rw-r--r--src/devices/bus/dmv/ram.cpp6
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp4
-rw-r--r--src/devices/bus/ecbbus/grip.cpp5
-rw-r--r--src/devices/bus/ecbbus/grip.h15
-rw-r--r--src/devices/bus/econet/e01.cpp4
-rw-r--r--src/devices/bus/econet/econet.cpp4
-rw-r--r--src/devices/bus/electron/exp.cpp2
-rw-r--r--src/devices/bus/electron/m2105.cpp3
-rw-r--r--src/devices/bus/electron/plus3.cpp2
-rw-r--r--src/devices/bus/ep64/exdos.cpp2
-rw-r--r--src/devices/bus/ep64/exp.cpp2
-rw-r--r--src/devices/bus/epson_sio/epson_sio.cpp2
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp2
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp2
-rw-r--r--src/devices/bus/gameboy/gb_slot.cpp4
-rw-r--r--src/devices/bus/gameboy/mbc.cpp34
-rw-r--r--src/devices/bus/gameboy/rom.cpp16
-rw-r--r--src/devices/bus/gamegear/ggext.cpp2
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp2
-rw-r--r--src/devices/bus/gba/gba_slot.cpp2
-rw-r--r--src/devices/bus/gba/rom.cpp26
-rw-r--r--src/devices/bus/generic/ram.cpp12
-rw-r--r--src/devices/bus/generic/rom.cpp6
-rw-r--r--src/devices/bus/generic/slot.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp2
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp2
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.cpp4
-rw-r--r--src/devices/bus/ieee488/c2031.cpp2
-rw-r--r--src/devices/bus/ieee488/c2040.cpp6
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp2
-rw-r--r--src/devices/bus/ieee488/c8050.cpp8
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp2
-rw-r--r--src/devices/bus/ieee488/c8280.cpp2
-rw-r--r--src/devices/bus/ieee488/d9060.cpp4
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp2
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp2
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp4
-rw-r--r--src/devices/bus/ieee488/shark.cpp2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp2
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp2
-rw-r--r--src/devices/bus/imi7000/imi7000.cpp4
-rw-r--r--src/devices/bus/intv/ecs.cpp15
-rw-r--r--src/devices/bus/intv/rom.cpp8
-rw-r--r--src/devices/bus/intv/slot.cpp2
-rw-r--r--src/devices/bus/intv/voice.cpp13
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp8
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.cpp2
-rw-r--r--src/devices/bus/iq151/disc2.cpp2
-rw-r--r--src/devices/bus/iq151/grafik.cpp3
-rw-r--r--src/devices/bus/iq151/iq151.cpp2
-rw-r--r--src/devices/bus/iq151/minigraf.cpp2
-rw-r--r--src/devices/bus/iq151/ms151a.cpp2
-rw-r--r--src/devices/bus/iq151/rom.cpp10
-rw-r--r--src/devices/bus/iq151/staper.cpp2
-rw-r--r--src/devices/bus/iq151/video32.cpp3
-rw-r--r--src/devices/bus/iq151/video64.cpp4
-rw-r--r--src/devices/bus/isa/3c503.cpp2
-rw-r--r--src/devices/bus/isa/3c505.cpp2
-rw-r--r--src/devices/bus/isa/adlib.cpp7
-rw-r--r--src/devices/bus/isa/aga.cpp4
-rw-r--r--src/devices/bus/isa/aha1542.cpp2
-rw-r--r--src/devices/bus/isa/cga.cpp20
-rw-r--r--src/devices/bus/isa/cga.h10
-rw-r--r--src/devices/bus/isa/com.cpp4
-rw-r--r--src/devices/bus/isa/dectalk.cpp5
-rw-r--r--src/devices/bus/isa/ega.cpp5
-rw-r--r--src/devices/bus/isa/fdc.cpp10
-rw-r--r--src/devices/bus/isa/finalchs.cpp2
-rw-r--r--src/devices/bus/isa/gblaster.cpp6
-rw-r--r--src/devices/bus/isa/gus.cpp6
-rw-r--r--src/devices/bus/isa/hdc.cpp10
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp4
-rw-r--r--src/devices/bus/isa/ide.cpp7
-rw-r--r--src/devices/bus/isa/isa.cpp8
-rw-r--r--src/devices/bus/isa/lpt.cpp2
-rw-r--r--src/devices/bus/isa/mach32.cpp11
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp2
-rw-r--r--src/devices/bus/isa/mc1502_rom.cpp2
-rw-r--r--src/devices/bus/isa/mcd.cpp2
-rw-r--r--src/devices/bus/isa/mda.cpp11
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/mufdc.cpp4
-rw-r--r--src/devices/bus/isa/ne1000.cpp2
-rw-r--r--src/devices/bus/isa/ne2000.cpp2
-rw-r--r--src/devices/bus/isa/num9rev.cpp4
-rw-r--r--src/devices/bus/isa/omti8621.cpp6
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp2
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp2
-rw-r--r--src/devices/bus/isa/p1_rom.cpp2
-rw-r--r--src/devices/bus/isa/p1_sound.cpp5
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp2
-rw-r--r--src/devices/bus/isa/pds.cpp2
-rw-r--r--src/devices/bus/isa/pgc.cpp6
-rw-r--r--src/devices/bus/isa/s3virge.cpp11
-rw-r--r--src/devices/bus/isa/sb16.cpp5
-rw-r--r--src/devices/bus/isa/sblaster.cpp12
-rw-r--r--src/devices/bus/isa/sc499.cpp6
-rw-r--r--src/devices/bus/isa/side116.cpp2
-rw-r--r--src/devices/bus/isa/ssi2001.cpp5
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp5
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp7
-rw-r--r--src/devices/bus/isa/svga_s3.cpp11
-rw-r--r--src/devices/bus/isa/svga_trident.cpp4
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp5
-rw-r--r--src/devices/bus/isa/trident.cpp7
-rw-r--r--src/devices/bus/isa/vga.cpp2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp9
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.cpp2
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp2
-rw-r--r--src/devices/bus/isa/xtide.cpp2
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp2
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp2
-rw-r--r--src/devices/bus/isbx/isbx.cpp2
-rw-r--r--src/devices/bus/kc/d002.cpp2
-rw-r--r--src/devices/bus/kc/d004.cpp4
-rw-r--r--src/devices/bus/kc/kc.cpp4
-rw-r--r--src/devices/bus/kc/ram.cpp12
-rw-r--r--src/devices/bus/kc/rom.cpp6
-rw-r--r--src/devices/bus/lpci/cirrus.cpp2
-rw-r--r--src/devices/bus/lpci/i82371ab.cpp2
-rw-r--r--src/devices/bus/lpci/i82371sb.cpp2
-rw-r--r--src/devices/bus/lpci/i82439tx.cpp2
-rw-r--r--src/devices/bus/lpci/mpc105.cpp2
-rw-r--r--src/devices/bus/lpci/pci.cpp4
-rw-r--r--src/devices/bus/lpci/southbridge.cpp4
-rw-r--r--src/devices/bus/lpci/southbridge.h10
-rw-r--r--src/devices/bus/lpci/vt82c505.cpp2
-rw-r--r--src/devices/bus/m5/rom.cpp4
-rw-r--r--src/devices/bus/m5/slot.cpp2
-rw-r--r--src/devices/bus/macpds/macpds.cpp4
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.cpp5
-rw-r--r--src/devices/bus/megadrive/eeprom.cpp16
-rw-r--r--src/devices/bus/megadrive/ggenie.cpp2
-rw-r--r--src/devices/bus/megadrive/jcart.cpp6
-rw-r--r--src/devices/bus/megadrive/md_slot.cpp6
-rw-r--r--src/devices/bus/megadrive/rom.cpp70
-rw-r--r--src/devices/bus/megadrive/sk.cpp2
-rw-r--r--src/devices/bus/megadrive/stm95.cpp2
-rw-r--r--src/devices/bus/megadrive/svp.cpp2
-rw-r--r--src/devices/bus/midi/midi.cpp2
-rw-r--r--src/devices/bus/midi/midiinport.cpp2
-rw-r--r--src/devices/bus/midi/midioutport.cpp2
-rw-r--r--src/devices/bus/msx_cart/arc.cpp2
-rw-r--r--src/devices/bus/msx_cart/ascii.cpp10
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp2
-rw-r--r--src/devices/bus/msx_cart/crossblaim.cpp2
-rw-r--r--src/devices/bus/msx_cart/disk.cpp8
-rw-r--r--src/devices/bus/msx_cart/dooly.cpp2
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp3
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.cpp2
-rw-r--r--src/devices/bus/msx_cart/halnote.cpp2
-rw-r--r--src/devices/bus/msx_cart/hfox.cpp2
-rw-r--r--src/devices/bus/msx_cart/holy_quran.cpp2
-rw-r--r--src/devices/bus/msx_cart/konami.cpp17
-rw-r--r--src/devices/bus/msx_cart/korean.cpp6
-rw-r--r--src/devices/bus/msx_cart/majutsushi.cpp5
-rw-r--r--src/devices/bus/msx_cart/moonsound.cpp4
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp8
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.cpp6
-rw-r--r--src/devices/bus/msx_cart/msxdos2.cpp2
-rw-r--r--src/devices/bus/msx_cart/nomapper.cpp2
-rw-r--r--src/devices/bus/msx_cart/rtype.cpp2
-rw-r--r--src/devices/bus/msx_cart/super_swangi.cpp2
-rw-r--r--src/devices/bus/msx_cart/superloderunner.cpp2
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp6
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.cpp2
-rw-r--r--src/devices/bus/msx_slot/cartridge.cpp4
-rw-r--r--src/devices/bus/msx_slot/disk.cpp12
-rw-r--r--src/devices/bus/msx_slot/fs4600.cpp2
-rw-r--r--src/devices/bus/msx_slot/music.cpp2
-rw-r--r--src/devices/bus/msx_slot/panasonic08.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram_mm.cpp2
-rw-r--r--src/devices/bus/msx_slot/rom.cpp2
-rw-r--r--src/devices/bus/msx_slot/sony08.cpp2
-rw-r--r--src/devices/bus/nasbus/avc.cpp4
-rw-r--r--src/devices/bus/nasbus/floppy.cpp2
-rw-r--r--src/devices/bus/nasbus/nasbus.cpp4
-rw-r--r--src/devices/bus/neogeo/boot_cthd.cpp8
-rw-r--r--src/devices/bus/neogeo/boot_kof10th.cpp2
-rw-r--r--src/devices/bus/neogeo/boot_kof2k2.cpp6
-rw-r--r--src/devices/bus/neogeo/boot_kof2k3.cpp6
-rw-r--r--src/devices/bus/neogeo/boot_misc.cpp22
-rw-r--r--src/devices/bus/neogeo/boot_svc.cpp8
-rw-r--r--src/devices/bus/neogeo/cmc.cpp26
-rw-r--r--src/devices/bus/neogeo/fatfury2.cpp2
-rw-r--r--src/devices/bus/neogeo/kof2k2.cpp12
-rw-r--r--src/devices/bus/neogeo/kof98.cpp2
-rw-r--r--src/devices/bus/neogeo/mslugx.cpp2
-rw-r--r--src/devices/bus/neogeo/pcm2.cpp10
-rw-r--r--src/devices/bus/neogeo/prot_cmc.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_cthd.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_kof2k2.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_kof2k3bl.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_kof98.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_misc.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_mslugx.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_pcm2.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_pvc.cpp2
-rw-r--r--src/devices/bus/neogeo/prot_sma.cpp2
-rw-r--r--src/devices/bus/neogeo/pvc.cpp10
-rw-r--r--src/devices/bus/neogeo/rom.cpp4
-rw-r--r--src/devices/bus/neogeo/sbp.cpp2
-rw-r--r--src/devices/bus/neogeo/slot.cpp2
-rw-r--r--src/devices/bus/neogeo/sma.cpp12
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.cpp4
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.cpp2
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.cpp2
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.cpp4
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.cpp2
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.cpp4
-rw-r--r--src/devices/bus/nes/2a03pur.cpp2
-rw-r--r--src/devices/bus/nes/act53.cpp2
-rw-r--r--src/devices/bus/nes/aladdin.cpp8
-rw-r--r--src/devices/bus/nes/ave.cpp6
-rw-r--r--src/devices/bus/nes/bandai.cpp12
-rw-r--r--src/devices/bus/nes/benshieng.cpp2
-rw-r--r--src/devices/bus/nes/bootleg.cpp43
-rw-r--r--src/devices/bus/nes/camerica.cpp6
-rw-r--r--src/devices/bus/nes/cne.cpp6
-rw-r--r--src/devices/bus/nes/cony.cpp4
-rw-r--r--src/devices/bus/nes/datach.cpp8
-rw-r--r--src/devices/bus/nes/discrete.cpp8
-rw-r--r--src/devices/bus/nes/disksys.cpp2
-rw-r--r--src/devices/bus/nes/event.cpp2
-rw-r--r--src/devices/bus/nes/ggenie.cpp2
-rw-r--r--src/devices/bus/nes/henggedianzi.cpp6
-rw-r--r--src/devices/bus/nes/hes.cpp2
-rw-r--r--src/devices/bus/nes/hosenkan.cpp3
-rw-r--r--src/devices/bus/nes/irem.cpp10
-rw-r--r--src/devices/bus/nes/jaleco.cpp26
-rw-r--r--src/devices/bus/nes/jy.cpp6
-rw-r--r--src/devices/bus/nes/kaiser.cpp20
-rw-r--r--src/devices/bus/nes/karastudio.cpp6
-rw-r--r--src/devices/bus/nes/konami.cpp14
-rw-r--r--src/devices/bus/nes/legacy.cpp6
-rw-r--r--src/devices/bus/nes/mmc1.cpp8
-rw-r--r--src/devices/bus/nes/mmc2.cpp4
-rw-r--r--src/devices/bus/nes/mmc3.cpp13
-rw-r--r--src/devices/bus/nes/mmc3_clones.cpp72
-rw-r--r--src/devices/bus/nes/mmc5.cpp2
-rw-r--r--src/devices/bus/nes/multigame.cpp94
-rw-r--r--src/devices/bus/nes/namcot.cpp12
-rw-r--r--src/devices/bus/nes/nanjing.cpp2
-rw-r--r--src/devices/bus/nes/nes_slot.cpp2
-rw-r--r--src/devices/bus/nes/ntdec.cpp4
-rw-r--r--src/devices/bus/nes/nxrom.cpp24
-rw-r--r--src/devices/bus/nes/pirate.cpp35
-rw-r--r--src/devices/bus/nes/pt554.cpp3
-rw-r--r--src/devices/bus/nes/racermate.cpp2
-rw-r--r--src/devices/bus/nes/rcm.cpp10
-rw-r--r--src/devices/bus/nes/rexsoft.cpp4
-rw-r--r--src/devices/bus/nes/sachen.cpp28
-rw-r--r--src/devices/bus/nes/somari.cpp2
-rw-r--r--src/devices/bus/nes/sunsoft.cpp14
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp6
-rw-r--r--src/devices/bus/nes/taito.cpp8
-rw-r--r--src/devices/bus/nes/tengen.cpp6
-rw-r--r--src/devices/bus/nes/txc.cpp10
-rw-r--r--src/devices/bus/nes/waixing.cpp42
-rw-r--r--src/devices/bus/nes/zemina.cpp6
-rw-r--r--src/devices/bus/nes_ctrl/4score.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/partytap.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp2
-rw-r--r--src/devices/bus/newbrain/eim.cpp2
-rw-r--r--src/devices/bus/newbrain/exp.cpp2
-rw-r--r--src/devices/bus/newbrain/fdc.cpp2
-rw-r--r--src/devices/bus/nubus/nubus.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp5
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_cb264.cpp3
-rw-r--r--src/devices/bus/nubus/nubus_image.cpp6
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.cpp3
-rw-r--r--src/devices/bus/nubus/nubus_m2video.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_spec8.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.cpp3
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.cpp3
-rw-r--r--src/devices/bus/nubus/pds30_30hr.cpp3
-rw-r--r--src/devices/bus/nubus/pds30_cb264.cpp3
-rw-r--r--src/devices/bus/nubus/pds30_mc30.cpp3
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.cpp3
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.cpp3
-rw-r--r--src/devices/bus/odyssey2/chess.cpp2
-rw-r--r--src/devices/bus/odyssey2/rom.cpp6
-rw-r--r--src/devices/bus/odyssey2/slot.cpp2
-rw-r--r--src/devices/bus/odyssey2/voice.cpp3
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.cpp2
-rw-r--r--src/devices/bus/oricext/oricext.cpp2
-rw-r--r--src/devices/bus/pc1512/mouse.cpp4
-rw-r--r--src/devices/bus/pc_joy/pc_joy.cpp4
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.cpp2
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp2
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp2
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp4
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp2
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp2
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp2
-rw-r--r--src/devices/bus/pce/pce_rom.cpp8
-rw-r--r--src/devices/bus/pce/pce_slot.cpp2
-rw-r--r--src/devices/bus/pet/2joysnd.cpp4
-rw-r--r--src/devices/bus/pet/64k.cpp2
-rw-r--r--src/devices/bus/pet/c2n.cpp6
-rw-r--r--src/devices/bus/pet/cass.cpp2
-rw-r--r--src/devices/bus/pet/cb2snd.cpp5
-rw-r--r--src/devices/bus/pet/diag.cpp2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp2
-rw-r--r--src/devices/bus/pet/exp.cpp2
-rw-r--r--src/devices/bus/pet/hsg.cpp6
-rw-r--r--src/devices/bus/pet/petuja.cpp2
-rw-r--r--src/devices/bus/pet/superpet.cpp2
-rw-r--r--src/devices/bus/pet/user.cpp2
-rw-r--r--src/devices/bus/plus4/c1551.cpp2
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.cpp2
-rw-r--r--src/devices/bus/plus4/exp.cpp2
-rw-r--r--src/devices/bus/plus4/sid.cpp4
-rw-r--r--src/devices/bus/plus4/std.cpp2
-rw-r--r--src/devices/bus/pofo/ccm.cpp2
-rw-r--r--src/devices/bus/pofo/exp.cpp2
-rw-r--r--src/devices/bus/pofo/hpc101.cpp2
-rw-r--r--src/devices/bus/pofo/hpc102.cpp2
-rw-r--r--src/devices/bus/pofo/hpc104.cpp4
-rw-r--r--src/devices/bus/pofo/ram.cpp2
-rw-r--r--src/devices/bus/pofo/rom.cpp2
-rw-r--r--src/devices/bus/psx/analogue.cpp4
-rw-r--r--src/devices/bus/psx/ctlrport.cpp6
-rw-r--r--src/devices/bus/psx/memcard.cpp2
-rw-r--r--src/devices/bus/psx/multitap.cpp2
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp2
-rw-r--r--src/devices/bus/ql/cst_qdisc.cpp2
-rw-r--r--src/devices/bus/ql/cumana_fdi.cpp2
-rw-r--r--src/devices/bus/ql/exp.cpp2
-rw-r--r--src/devices/bus/ql/kempston_di.cpp2
-rw-r--r--src/devices/bus/ql/miracle_gold_card.cpp2
-rw-r--r--src/devices/bus/ql/miracle_hd.cpp2
-rw-r--r--src/devices/bus/ql/mp_fdi.cpp2
-rw-r--r--src/devices/bus/ql/opd_basic_master.cpp2
-rw-r--r--src/devices/bus/ql/pcml_qdisk.cpp2
-rw-r--r--src/devices/bus/ql/qubide.cpp2
-rw-r--r--src/devices/bus/ql/rom.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp8
-rw-r--r--src/devices/bus/ql/std.cpp2
-rw-r--r--src/devices/bus/ql/trumpcard.cpp8
-rw-r--r--src/devices/bus/rs232/keyboard.cpp2
-rw-r--r--src/devices/bus/rs232/loopback.cpp2
-rw-r--r--src/devices/bus/rs232/null_modem.cpp2
-rw-r--r--src/devices/bus/rs232/printer.cpp2
-rw-r--r--src/devices/bus/rs232/pty.cpp2
-rw-r--r--src/devices/bus/rs232/rs232.cpp2
-rw-r--r--src/devices/bus/rs232/ser_mouse.cpp4
-rw-r--r--src/devices/bus/rs232/sun_kbd.cpp2
-rw-r--r--src/devices/bus/rs232/terminal.cpp2
-rw-r--r--src/devices/bus/rs232/xvd701.cpp2
-rw-r--r--src/devices/bus/s100/dj2db.cpp2
-rw-r--r--src/devices/bus/s100/djdma.cpp2
-rw-r--r--src/devices/bus/s100/mm65k16s.cpp2
-rw-r--r--src/devices/bus/s100/nsmdsa.cpp2
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp2
-rw-r--r--src/devices/bus/s100/s100.cpp4
-rw-r--r--src/devices/bus/s100/wunderbus.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/analog.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/joy.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.cpp4
-rw-r--r--src/devices/bus/sat_ctrl/keybd.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/mouse.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/pointer.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/racing.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/segatap.cpp2
-rw-r--r--src/devices/bus/saturn/bram.cpp8
-rw-r--r--src/devices/bus/saturn/dram.cpp4
-rw-r--r--src/devices/bus/saturn/rom.cpp2
-rw-r--r--src/devices/bus/saturn/sat_slot.cpp2
-rw-r--r--src/devices/bus/scsi/acb4070.cpp2
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp2
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp2
-rw-r--r--src/devices/bus/scsi/omti5100.cpp2
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp2
-rw-r--r--src/devices/bus/scsi/s1410.cpp2
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp2
-rw-r--r--src/devices/bus/scsi/scsi.cpp4
-rw-r--r--src/devices/bus/scsi/scsicd.cpp2
-rw-r--r--src/devices/bus/scsi/scsihd.cpp2
-rw-r--r--src/devices/bus/scv/rom.cpp14
-rw-r--r--src/devices/bus/scv/slot.cpp2
-rw-r--r--src/devices/bus/sega8/ccatch.cpp2
-rw-r--r--src/devices/bus/sega8/mgear.cpp2
-rw-r--r--src/devices/bus/sega8/rom.cpp36
-rw-r--r--src/devices/bus/sega8/sega8_slot.cpp4
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/graphic.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp2
-rw-r--r--src/devices/bus/sms_exp/gender.cpp2
-rw-r--r--src/devices/bus/sms_exp/smsexp.cpp2
-rw-r--r--src/devices/bus/snes/bsx.cpp8
-rw-r--r--src/devices/bus/snes/event.cpp2
-rw-r--r--src/devices/bus/snes/rom.cpp20
-rw-r--r--src/devices/bus/snes/rom21.cpp4
-rw-r--r--src/devices/bus/snes/sa1.cpp2
-rw-r--r--src/devices/bus/snes/sdd1.cpp2
-rw-r--r--src/devices/bus/snes/sfx.cpp2
-rw-r--r--src/devices/bus/snes/sgb.cpp4
-rw-r--r--src/devices/bus/snes/snes_slot.cpp6
-rw-r--r--src/devices/bus/snes/spc7110.cpp4
-rw-r--r--src/devices/bus/snes/sufami.cpp4
-rw-r--r--src/devices/bus/snes/upd.cpp24
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/joypad.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/mouse.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/sscope.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/twintap.cpp2
-rw-r--r--src/devices/bus/spc1000/exp.cpp2
-rw-r--r--src/devices/bus/spc1000/fdd.cpp2
-rw-r--r--src/devices/bus/spc1000/vdp.cpp2
-rw-r--r--src/devices/bus/sunkbd/hlekbd.cpp13
-rw-r--r--src/devices/bus/sunkbd/sunkbd.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/expander.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/slot.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.cpp2
-rw-r--r--src/devices/bus/ti99_peb/bwg.cpp2
-rw-r--r--src/devices/bus/ti99_peb/evpc.cpp5
-rw-r--r--src/devices/bus/ti99_peb/hfdc.cpp2
-rw-r--r--src/devices/bus/ti99_peb/horizon.cpp2
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.cpp2
-rw-r--r--src/devices/bus/ti99_peb/memex.cpp2
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/pcode.cpp2
-rw-r--r--src/devices/bus/ti99_peb/peribox.cpp12
-rw-r--r--src/devices/bus/ti99_peb/samsmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.cpp7
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/ti_fdc.cpp2
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.cpp6
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.cpp2
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.cpp2
-rw-r--r--src/devices/bus/ti99x/990_dk.cpp2
-rw-r--r--src/devices/bus/ti99x/990_hd.cpp2
-rw-r--r--src/devices/bus/ti99x/990_tap.cpp4
-rw-r--r--src/devices/bus/ti99x/998board.cpp10
-rw-r--r--src/devices/bus/ti99x/datamux.cpp2
-rw-r--r--src/devices/bus/ti99x/genboard.cpp6
-rw-r--r--src/devices/bus/ti99x/gromport.cpp10
-rw-r--r--src/devices/bus/ti99x/handset.cpp4
-rw-r--r--src/devices/bus/ti99x/joyport.cpp2
-rw-r--r--src/devices/bus/ti99x/mecmouse.cpp2
-rw-r--r--src/devices/bus/ti99x/ti99defs.cpp17
-rw-r--r--src/devices/bus/ti99x/ti99defs.h10
-rw-r--r--src/devices/bus/tiki100/8088.cpp2
-rw-r--r--src/devices/bus/tiki100/exp.cpp4
-rw-r--r--src/devices/bus/tiki100/hdc.cpp2
-rw-r--r--src/devices/bus/tvc/hbf.cpp2
-rw-r--r--src/devices/bus/tvc/tvc.cpp2
-rw-r--r--src/devices/bus/vboy/rom.cpp4
-rw-r--r--src/devices/bus/vboy/slot.cpp2
-rw-r--r--src/devices/bus/vc4000/rom.cpp8
-rw-r--r--src/devices/bus/vc4000/slot.cpp4
-rw-r--r--src/devices/bus/vcs/compumat.cpp2
-rw-r--r--src/devices/bus/vcs/dpc.cpp4
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp2
-rwxr-xr-xsrc/devices/bus/vcs/rom.cpp42
-rw-r--r--src/devices/bus/vcs/scharger.cpp2
-rw-r--r--src/devices/bus/vcs/vcs_slot.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.cpp2
-rw-r--r--src/devices/bus/vectrex/rom.cpp6
-rw-r--r--src/devices/bus/vectrex/slot.cpp2
-rw-r--r--src/devices/bus/vic10/exp.cpp2
-rw-r--r--src/devices/bus/vic10/std.cpp2
-rw-r--r--src/devices/bus/vic20/4cga.cpp2
-rw-r--r--src/devices/bus/vic20/exp.cpp2
-rw-r--r--src/devices/bus/vic20/fe3.cpp2
-rw-r--r--src/devices/bus/vic20/megacart.cpp2
-rw-r--r--src/devices/bus/vic20/speakeasy.cpp4
-rw-r--r--src/devices/bus/vic20/std.cpp2
-rw-r--r--src/devices/bus/vic20/vic1010.cpp2
-rw-r--r--src/devices/bus/vic20/vic1011.cpp2
-rw-r--r--src/devices/bus/vic20/vic1110.cpp2
-rw-r--r--src/devices/bus/vic20/vic1111.cpp2
-rw-r--r--src/devices/bus/vic20/vic1112.cpp2
-rw-r--r--src/devices/bus/vic20/vic1210.cpp2
-rw-r--r--src/devices/bus/vic20/videopak.cpp4
-rw-r--r--src/devices/bus/vidbrain/exp.cpp2
-rw-r--r--src/devices/bus/vidbrain/money_minder.cpp2
-rw-r--r--src/devices/bus/vidbrain/std.cpp2
-rw-r--r--src/devices/bus/vidbrain/timeshare.cpp2
-rw-r--r--src/devices/bus/vip/byteio.cpp2
-rw-r--r--src/devices/bus/vip/exp.cpp2
-rw-r--r--src/devices/bus/vip/vp550.cpp4
-rw-r--r--src/devices/bus/vip/vp570.cpp2
-rw-r--r--src/devices/bus/vip/vp575.cpp2
-rw-r--r--src/devices/bus/vip/vp585.cpp2
-rw-r--r--src/devices/bus/vip/vp590.cpp2
-rw-r--r--src/devices/bus/vip/vp595.cpp4
-rw-r--r--src/devices/bus/vip/vp620.cpp2
-rw-r--r--src/devices/bus/vip/vp700.cpp2
-rw-r--r--src/devices/bus/vme/vme.cpp4
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp14
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp2
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp2
-rw-r--r--src/devices/bus/vme/vme_mvme350.cpp2
-rw-r--r--src/devices/bus/vme/vme_mzr8105.cpp2
-rw-r--r--src/devices/bus/vme/vme_mzr8300.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/memexp.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp8
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rtty.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.cpp2
-rw-r--r--src/devices/bus/wangpc/emb.cpp2
-rw-r--r--src/devices/bus/wangpc/lic.cpp2
-rw-r--r--src/devices/bus/wangpc/lvc.cpp4
-rw-r--r--src/devices/bus/wangpc/mcc.cpp2
-rw-r--r--src/devices/bus/wangpc/mvc.cpp4
-rw-r--r--src/devices/bus/wangpc/rtc.cpp2
-rw-r--r--src/devices/bus/wangpc/tig.cpp4
-rw-r--r--src/devices/bus/wangpc/wangpc.cpp4
-rw-r--r--src/devices/bus/wangpc/wdc.cpp2
-rw-r--r--src/devices/bus/wswan/rom.cpp6
-rw-r--r--src/devices/bus/wswan/slot.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp2
-rw-r--r--src/devices/bus/x68k/x68kexp.cpp2
-rw-r--r--src/devices/bus/z88/flash.cpp2
-rw-r--r--src/devices/bus/z88/ram.cpp8
-rw-r--r--src/devices/bus/z88/rom.cpp6
-rw-r--r--src/devices/bus/z88/z88.cpp2
-rw-r--r--src/devices/cpu/8x300/8x300.cpp2
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp12
-rw-r--r--src/devices/cpu/alph8201/alph8201.cpp4
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp2
-rw-r--r--src/devices/cpu/alto2/alto2cpu.h14
-rw-r--r--src/devices/cpu/am29000/am29000.cpp2
-rw-r--r--src/devices/cpu/amis2000/amis2000.cpp6
-rw-r--r--src/devices/cpu/apexc/apexc.cpp2
-rw-r--r--src/devices/cpu/arc/arc.cpp2
-rw-r--r--src/devices/cpu/arcompact/arcompact.cpp2
-rw-r--r--src/devices/cpu/arm/arm.cpp4
-rw-r--r--src/devices/cpu/arm7/arm7.cpp14
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp2
-rw-r--r--src/devices/cpu/asap/asap.cpp2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp8
-rw-r--r--src/devices/cpu/ccpu/ccpu.cpp2
-rw-r--r--src/devices/cpu/clipper/clipper.cpp6
-rw-r--r--src/devices/cpu/cop400/cop400.cpp34
-rw-r--r--src/devices/cpu/cosmac/cosmac.cpp4
-rw-r--r--src/devices/cpu/cp1610/cp1610.cpp2
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.cpp6
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp2
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp2
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.cpp2
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp28
-rw-r--r--src/devices/cpu/es5510/es5510.cpp2
-rw-r--r--src/devices/cpu/esrip/esrip.cpp6
-rw-r--r--src/devices/cpu/f8/f8.cpp2
-rw-r--r--src/devices/cpu/g65816/g65816.cpp4
-rw-r--r--src/devices/cpu/h6280/h6280.cpp2
-rw-r--r--src/devices/cpu/h8/h83002.cpp2
-rw-r--r--src/devices/cpu/h8/h83006.cpp4
-rw-r--r--src/devices/cpu/h8/h83008.cpp2
-rw-r--r--src/devices/cpu/h8/h83048.cpp8
-rw-r--r--src/devices/cpu/h8/h83337.cpp6
-rw-r--r--src/devices/cpu/h8/h8_adc.cpp12
-rw-r--r--src/devices/cpu/h8/h8_dma.cpp4
-rw-r--r--src/devices/cpu/h8/h8_dtc.cpp2
-rw-r--r--src/devices/cpu/h8/h8_intc.cpp6
-rw-r--r--src/devices/cpu/h8/h8_port.cpp2
-rw-r--r--src/devices/cpu/h8/h8_sci.cpp2
-rw-r--r--src/devices/cpu/h8/h8_timer16.cpp8
-rw-r--r--src/devices/cpu/h8/h8_timer8.cpp4
-rw-r--r--src/devices/cpu/h8/h8_watchdog.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2245.cpp8
-rw-r--r--src/devices/cpu/h8/h8s2320.cpp18
-rw-r--r--src/devices/cpu/h8/h8s2357.cpp12
-rw-r--r--src/devices/cpu/h8/h8s2655.cpp4
-rw-r--r--src/devices/cpu/hcd62121/hcd62121.cpp2
-rw-r--r--src/devices/cpu/hd61700/hd61700.cpp2
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp40
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp4
-rw-r--r--src/devices/cpu/i386/i386.cpp20
-rw-r--r--src/devices/cpu/i4004/i4004.cpp2
-rw-r--r--src/devices/cpu/i8008/i8008.cpp2
-rw-r--r--src/devices/cpu/i8085/i8085.cpp6
-rw-r--r--src/devices/cpu/i8089/i8089.cpp2
-rw-r--r--src/devices/cpu/i8089/i8089_channel.cpp2
-rw-r--r--src/devices/cpu/i86/i186.cpp4
-rw-r--r--src/devices/cpu/i86/i286.cpp2
-rw-r--r--src/devices/cpu/i86/i86.cpp4
-rw-r--r--src/devices/cpu/i860/i860.cpp2
-rw-r--r--src/devices/cpu/i960/i960.cpp2
-rw-r--r--src/devices/cpu/ie15/ie15.cpp6
-rw-r--r--src/devices/cpu/jaguar/jaguar.cpp4
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp2
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp2
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp2
-rw-r--r--src/devices/cpu/m37710/m37710.cpp6
-rw-r--r--src/devices/cpu/m6502/deco16.cpp2
-rw-r--r--src/devices/cpu/m6502/m3745x.cpp2
-rw-r--r--src/devices/cpu/m6502/m4510.cpp2
-rw-r--r--src/devices/cpu/m6502/m5074x.cpp4
-rw-r--r--src/devices/cpu/m6502/m6502.cpp2
-rw-r--r--src/devices/cpu/m6502/m6504.cpp2
-rw-r--r--src/devices/cpu/m6502/m6507.cpp2
-rw-r--r--src/devices/cpu/m6502/m6509.cpp2
-rw-r--r--src/devices/cpu/m6502/m6510.cpp2
-rw-r--r--src/devices/cpu/m6502/m6510t.cpp2
-rw-r--r--src/devices/cpu/m6502/m65c02.cpp2
-rw-r--r--src/devices/cpu/m6502/m65ce02.cpp2
-rw-r--r--src/devices/cpu/m6502/m65sc02.cpp2
-rw-r--r--src/devices/cpu/m6502/m740.cpp2
-rw-r--r--src/devices/cpu/m6502/m7501.cpp2
-rw-r--r--src/devices/cpu/m6502/m8502.cpp2
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/m6502/r65c02.cpp2
-rw-r--r--src/devices/cpu/m6800/m6800.cpp20
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp38
-rw-r--r--src/devices/cpu/m6805/m6805.cpp6
-rw-r--r--src/devices/cpu/m6805/m68705.cpp8
-rw-r--r--src/devices/cpu/m6805/m68hc05.cpp6
-rw-r--r--src/devices/cpu/m6809/hd6309.cpp2
-rw-r--r--src/devices/cpu/m6809/konami.cpp2
-rw-r--r--src/devices/cpu/m6809/m6809.cpp4
-rw-r--r--src/devices/cpu/mb86233/mb86233.cpp2
-rw-r--r--src/devices/cpu/mb86235/mb86235.cpp2
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.cpp14
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp2
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp38
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp28
-rw-r--r--src/devices/cpu/mcs96/i8x9x.cpp4
-rw-r--r--src/devices/cpu/melps4/m58846.cpp2
-rw-r--r--src/devices/cpu/minx/minx.cpp2
-rw-r--r--src/devices/cpu/mips/mips3.cpp32
-rw-r--r--src/devices/cpu/mips/r3000.cpp10
-rw-r--r--src/devices/cpu/mn10200/mn10200.cpp2
-rw-r--r--src/devices/cpu/nanoprocessor/nanoprocessor.cpp2
-rw-r--r--src/devices/cpu/nec/nec.cpp8
-rw-r--r--src/devices/cpu/nec/v25.cpp4
-rw-r--r--src/devices/cpu/nec/v53.cpp4
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.cpp2
-rw-r--r--src/devices/cpu/patinhofeio/patinhofeio_cpu.h4
-rw-r--r--src/devices/cpu/pdp1/pdp1.cpp2
-rw-r--r--src/devices/cpu/pdp1/tx0.cpp4
-rw-r--r--src/devices/cpu/pdp8/pdp8.cpp2
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp16
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.cpp12
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp20
-rw-r--r--src/devices/cpu/pps4/pps4.cpp4
-rw-r--r--src/devices/cpu/psx/dma.cpp2
-rw-r--r--src/devices/cpu/psx/irq.cpp2
-rw-r--r--src/devices/cpu/psx/mdec.cpp2
-rw-r--r--src/devices/cpu/psx/psx.cpp15
-rw-r--r--src/devices/cpu/psx/psx.h19
-rw-r--r--src/devices/cpu/psx/rcnt.cpp2
-rw-r--r--src/devices/cpu/psx/sio.cpp4
-rw-r--r--src/devices/cpu/rsp/rsp.cpp2
-rw-r--r--src/devices/cpu/s2650/s2650.cpp2
-rw-r--r--src/devices/cpu/saturn/saturn.cpp2
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp2
-rw-r--r--src/devices/cpu/scmp/scmp.cpp4
-rw-r--r--src/devices/cpu/score/score.cpp2
-rw-r--r--src/devices/cpu/scudsp/scudsp.cpp2
-rw-r--r--src/devices/cpu/se3208/se3208.cpp2
-rw-r--r--src/devices/cpu/sh2/sh2.cpp6
-rw-r--r--src/devices/cpu/sh2/sh7604_bus.cpp2
-rw-r--r--src/devices/cpu/sh2/sh7604_sci.cpp2
-rw-r--r--src/devices/cpu/sh2/sh7604_wdt.cpp2
-rw-r--r--src/devices/cpu/sh4/sh4.cpp8
-rw-r--r--src/devices/cpu/sharc/sharc.cpp2
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2core.cpp2
-rw-r--r--src/devices/cpu/sm510/sm500core.cpp2
-rw-r--r--src/devices/cpu/sm510/sm510core.cpp2
-rw-r--r--src/devices/cpu/sm510/sm511core.cpp4
-rw-r--r--src/devices/cpu/sm8500/sm8500.cpp2
-rw-r--r--src/devices/cpu/sparc/mb86901.cpp2
-rw-r--r--src/devices/cpu/spc700/spc700.cpp2
-rw-r--r--src/devices/cpu/ssem/ssem.cpp2
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.cpp2
-rw-r--r--src/devices/cpu/superfx/superfx.cpp2
-rw-r--r--src/devices/cpu/t11/t11.cpp4
-rw-r--r--src/devices/cpu/tlcs870/tlcs870.cpp2
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp10
-rw-r--r--src/devices/cpu/tlcs900/tlcs900.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms0270.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms0970.cpp6
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms1000.cpp12
-rw-r--r--src/devices/cpu/tms1000/tms1100.cpp8
-rw-r--r--src/devices/cpu/tms1000/tms1400.cpp8
-rw-r--r--src/devices/cpu/tms1000/tp0320.cpp2
-rw-r--r--src/devices/cpu/tms32010/tms32010.cpp6
-rw-r--r--src/devices/cpu/tms32025/tms32025.cpp4
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp4
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp4
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp4
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp8
-rw-r--r--src/devices/cpu/tms57002/tms57002.cpp2
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp24
-rw-r--r--src/devices/cpu/tms9900/ti990_10.cpp2
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp2
-rw-r--r--src/devices/cpu/tms9900/tms9980a.cpp2
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp4
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp8
-rw-r--r--src/devices/cpu/unsp/unsp.cpp2
-rw-r--r--src/devices/cpu/upd7725/upd7725.cpp4
-rw-r--r--src/devices/cpu/upd7810/upd7810.cpp10
-rw-r--r--src/devices/cpu/v30mz/v30mz.cpp2
-rw-r--r--src/devices/cpu/v60/v60.cpp4
-rw-r--r--src/devices/cpu/v810/v810.cpp2
-rw-r--r--src/devices/cpu/z180/z180.cpp2
-rw-r--r--src/devices/cpu/z8/z8.cpp6
-rw-r--r--src/devices/cpu/z80/kl5c80a12.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp2
-rw-r--r--src/devices/cpu/z80/z80.cpp4
-rw-r--r--src/devices/cpu/z8000/z8000.cpp4
-rw-r--r--src/devices/imagedev/bitbngr.cpp2
-rw-r--r--src/devices/imagedev/cassette.cpp2
-rw-r--r--src/devices/imagedev/cassette.h2
-rw-r--r--src/devices/imagedev/chd_cd.cpp2
-rw-r--r--src/devices/imagedev/diablo.cpp2
-rw-r--r--src/devices/imagedev/flopdrv.cpp2
-rw-r--r--src/devices/imagedev/floppy.cpp122
-rw-r--r--src/devices/imagedev/harddriv.cpp2
-rw-r--r--src/devices/imagedev/mfmhd.cpp10
-rw-r--r--src/devices/imagedev/midiin.cpp2
-rw-r--r--src/devices/imagedev/midiin.h2
-rw-r--r--src/devices/imagedev/midiout.cpp2
-rw-r--r--src/devices/imagedev/midiout.h2
-rw-r--r--src/devices/imagedev/printer.cpp2
-rw-r--r--src/devices/imagedev/snapquik.cpp4
-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
-rw-r--r--src/devices/sound/2203intf.cpp2
-rw-r--r--src/devices/sound/2608intf.cpp2
-rw-r--r--src/devices/sound/2610intf.cpp4
-rw-r--r--src/devices/sound/2612intf.cpp4
-rw-r--r--src/devices/sound/262intf.cpp2
-rw-r--r--src/devices/sound/315-5641.cpp2
-rw-r--r--src/devices/sound/3526intf.cpp2
-rw-r--r--src/devices/sound/3812intf.cpp2
-rw-r--r--src/devices/sound/8950intf.cpp2
-rw-r--r--src/devices/sound/ad1848.cpp3
-rw-r--r--src/devices/sound/aica.cpp2
-rw-r--r--src/devices/sound/asc.cpp2
-rw-r--r--src/devices/sound/astrocde.cpp2
-rw-r--r--src/devices/sound/awacs.cpp2
-rw-r--r--src/devices/sound/ay8910.cpp18
-rw-r--r--src/devices/sound/beep.cpp2
-rw-r--r--src/devices/sound/bsmt2000.cpp2
-rw-r--r--src/devices/sound/c140.cpp2
-rw-r--r--src/devices/sound/c352.cpp2
-rw-r--r--src/devices/sound/c6280.cpp2
-rw-r--r--src/devices/sound/cdda.cpp2
-rw-r--r--src/devices/sound/cdp1863.cpp2
-rw-r--r--src/devices/sound/cdp1864.cpp2
-rw-r--r--src/devices/sound/cdp1864.h12
-rw-r--r--src/devices/sound/cdp1869.cpp2
-rw-r--r--src/devices/sound/cdp1869.h9
-rw-r--r--src/devices/sound/cem3394.cpp2
-rw-r--r--src/devices/sound/dac.cpp2
-rw-r--r--src/devices/sound/dac76.cpp2
-rw-r--r--src/devices/sound/dave.cpp2
-rw-r--r--src/devices/sound/dave.h12
-rw-r--r--src/devices/sound/digitalk.cpp2
-rw-r--r--src/devices/sound/discrete.cpp2
-rw-r--r--src/devices/sound/dmadac.cpp2
-rw-r--r--src/devices/sound/es1373.cpp7
-rw-r--r--src/devices/sound/es5503.cpp2
-rw-r--r--src/devices/sound/es5506.cpp4
-rw-r--r--src/devices/sound/es8712.cpp2
-rw-r--r--src/devices/sound/esqpump.cpp2
-rw-r--r--src/devices/sound/flt_rc.cpp2
-rw-r--r--src/devices/sound/flt_vol.cpp2
-rw-r--r--src/devices/sound/gaelco.cpp4
-rw-r--r--src/devices/sound/gb.cpp8
-rw-r--r--src/devices/sound/hc55516.cpp6
-rw-r--r--src/devices/sound/i5000.cpp2
-rw-r--r--src/devices/sound/ics2115.cpp2
-rw-r--r--src/devices/sound/iremga20.cpp2
-rw-r--r--src/devices/sound/k005289.cpp2
-rw-r--r--src/devices/sound/k007232.cpp2
-rw-r--r--src/devices/sound/k051649.cpp2
-rw-r--r--src/devices/sound/k053260.cpp2
-rw-r--r--src/devices/sound/k054539.cpp2
-rw-r--r--src/devices/sound/k056800.cpp2
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.cpp2
-rw-r--r--src/devices/sound/lmc1992.cpp2
-rw-r--r--src/devices/sound/mas3507d.cpp2
-rw-r--r--src/devices/sound/mea8000.cpp2
-rw-r--r--src/devices/sound/mm5837.cpp2
-rw-r--r--src/devices/sound/mos6560.cpp6
-rw-r--r--src/devices/sound/mos6560.h10
-rw-r--r--src/devices/sound/mos6581.cpp4
-rw-r--r--src/devices/sound/mos7360.cpp4
-rw-r--r--src/devices/sound/msm5205.cpp4
-rw-r--r--src/devices/sound/msm5232.cpp2
-rw-r--r--src/devices/sound/multipcm.cpp2
-rw-r--r--src/devices/sound/n63701x.cpp2
-rw-r--r--src/devices/sound/namco.cpp6
-rw-r--r--src/devices/sound/nes_apu.cpp4
-rw-r--r--src/devices/sound/nile.cpp2
-rw-r--r--src/devices/sound/okim6258.cpp2
-rw-r--r--src/devices/sound/okim6295.cpp2
-rw-r--r--src/devices/sound/okim6376.cpp2
-rw-r--r--src/devices/sound/okim9810.cpp2
-rw-r--r--src/devices/sound/pcd3311.cpp2
-rw-r--r--src/devices/sound/pci-ac97.cpp2
-rw-r--r--src/devices/sound/pokey.cpp2
-rw-r--r--src/devices/sound/qs1000.cpp2
-rw-r--r--src/devices/sound/qsound.cpp2
-rw-r--r--src/devices/sound/rf5c400.cpp2
-rw-r--r--src/devices/sound/rf5c68.cpp2
-rw-r--r--src/devices/sound/s14001a.cpp2
-rw-r--r--src/devices/sound/saa1099.cpp2
-rw-r--r--src/devices/sound/samples.cpp2
-rw-r--r--src/devices/sound/samples.h2
-rw-r--r--src/devices/sound/sb0400.cpp2
-rw-r--r--src/devices/sound/scsp.cpp2
-rw-r--r--src/devices/sound/segapcm.cpp2
-rw-r--r--src/devices/sound/sn76477.cpp2
-rw-r--r--src/devices/sound/sn76496.cpp20
-rw-r--r--src/devices/sound/snkwave.cpp2
-rw-r--r--src/devices/sound/sp0250.cpp2
-rw-r--r--src/devices/sound/sp0256.cpp2
-rw-r--r--src/devices/sound/spkrdev.cpp (renamed from src/devices/sound/speaker.cpp)13
-rw-r--r--src/devices/sound/spkrdev.h (renamed from src/devices/sound/speaker.h)6
-rw-r--r--src/devices/sound/spu.cpp2
-rw-r--r--src/devices/sound/st0016.cpp2
-rw-r--r--src/devices/sound/t6721a.cpp2
-rw-r--r--src/devices/sound/t6w28.cpp2
-rw-r--r--src/devices/sound/tc8830f.cpp2
-rw-r--r--src/devices/sound/tiaintf.cpp2
-rw-r--r--src/devices/sound/tms3615.cpp2
-rw-r--r--src/devices/sound/tms36xx.cpp2
-rw-r--r--src/devices/sound/tms5110.cpp20
-rw-r--r--src/devices/sound/tms5220.cpp10
-rw-r--r--src/devices/sound/upd1771.cpp2
-rw-r--r--src/devices/sound/upd7752.cpp2
-rw-r--r--src/devices/sound/upd7759.cpp4
-rw-r--r--src/devices/sound/vlm5030.cpp2
-rw-r--r--src/devices/sound/volt_reg.cpp2
-rw-r--r--src/devices/sound/votrax.cpp2
-rw-r--r--src/devices/sound/vrc6.cpp2
-rw-r--r--src/devices/sound/vrender0.cpp2
-rw-r--r--src/devices/sound/wave.cpp5
-rw-r--r--src/devices/sound/x1_010.cpp2
-rw-r--r--src/devices/sound/ym2151.cpp2
-rw-r--r--src/devices/sound/ym2413.cpp2
-rw-r--r--src/devices/sound/ymf271.cpp2
-rw-r--r--src/devices/sound/ymf278b.cpp2
-rw-r--r--src/devices/sound/ymz280b.cpp2
-rw-r--r--src/devices/sound/ymz770.cpp2
-rw-r--r--src/devices/sound/zsg2.cpp2
-rw-r--r--src/devices/video/315_5124.cpp6
-rw-r--r--src/devices/video/315_5124.h10
-rw-r--r--src/devices/video/315_5313.cpp2
-rw-r--r--src/devices/video/bufsprite.cpp8
-rw-r--r--src/devices/video/cdp1861.cpp2
-rw-r--r--src/devices/video/cdp1861.h11
-rw-r--r--src/devices/video/cdp1862.cpp4
-rw-r--r--src/devices/video/cesblit.cpp5
-rw-r--r--src/devices/video/clgd542x.cpp9
-rw-r--r--src/devices/video/crt9007.cpp4
-rw-r--r--src/devices/video/crt9021.cpp4
-rw-r--r--src/devices/video/crt9212.cpp2
-rw-r--r--src/devices/video/crtc_ega.cpp37
-rw-r--r--src/devices/video/dl1416.cpp6
-rw-r--r--src/devices/video/dm9368.cpp2
-rw-r--r--src/devices/video/ef9340_1.cpp4
-rw-r--r--src/devices/video/ef9345.cpp5
-rw-r--r--src/devices/video/ef9364.cpp5
-rw-r--r--src/devices/video/ef9365.cpp5
-rw-r--r--src/devices/video/ef9369.cpp2
-rw-r--r--src/devices/video/epic12.cpp2
-rw-r--r--src/devices/video/fixfreq.cpp2
-rw-r--r--src/devices/video/fixfreq.h8
-rw-r--r--src/devices/video/gb_lcd.cpp11
-rw-r--r--src/devices/video/gba_lcd.cpp6
-rw-r--r--src/devices/video/gf4500.cpp2
-rw-r--r--src/devices/video/gf7600gs.cpp2
-rw-r--r--src/devices/video/hd44102.cpp2
-rw-r--r--src/devices/video/hd44352.cpp2
-rw-r--r--src/devices/video/hd44780.cpp4
-rw-r--r--src/devices/video/hd61830.cpp6
-rw-r--r--src/devices/video/hd63484.cpp5
-rw-r--r--src/devices/video/hd66421.cpp2
-rw-r--r--src/devices/video/hlcd0515.cpp4
-rw-r--r--src/devices/video/huc6202.cpp2
-rw-r--r--src/devices/video/huc6260.cpp5
-rw-r--r--src/devices/video/huc6261.cpp5
-rw-r--r--src/devices/video/huc6270.cpp2
-rw-r--r--src/devices/video/huc6271.cpp2
-rw-r--r--src/devices/video/huc6272.cpp2
-rw-r--r--src/devices/video/i8244.cpp7
-rw-r--r--src/devices/video/i82730.cpp4
-rw-r--r--src/devices/video/i8275.cpp4
-rw-r--r--src/devices/video/jangou_blitter.cpp2
-rw-r--r--src/devices/video/m50458.cpp3
-rw-r--r--src/devices/video/mb90082.cpp2
-rw-r--r--src/devices/video/mb_vcu.cpp2
-rw-r--r--src/devices/video/mc6845.cpp28
-rw-r--r--src/devices/video/mc6847.cpp16
-rw-r--r--src/devices/video/mc6847.h7
-rw-r--r--src/devices/video/mga2064w.cpp2
-rw-r--r--src/devices/video/mos6566.cpp16
-rw-r--r--src/devices/video/msm6222b.cpp4
-rw-r--r--src/devices/video/msm6255.cpp2
-rw-r--r--src/devices/video/pc_vga.cpp36
-rw-r--r--src/devices/video/pc_vga.h36
-rw-r--r--src/devices/video/pcd8544.cpp5
-rw-r--r--src/devices/video/poly.h9
-rw-r--r--src/devices/video/ppu2c0x.cpp18
-rw-r--r--src/devices/video/psx.cpp19
-rw-r--r--src/devices/video/ramdac.cpp2
-rw-r--r--src/devices/video/saa5050.cpp16
-rw-r--r--src/devices/video/scn2674.cpp5
-rw-r--r--src/devices/video/sed1200.cpp8
-rw-r--r--src/devices/video/sed1330.cpp2
-rw-r--r--src/devices/video/sed1520.cpp4
-rw-r--r--src/devices/video/snes_ppu.cpp2
-rw-r--r--src/devices/video/snes_ppu.h8
-rw-r--r--src/devices/video/stvvdp1.cpp3
-rw-r--r--src/devices/video/stvvdp2.cpp14
-rw-r--r--src/devices/video/t6a04.cpp2
-rw-r--r--src/devices/video/tea1002.cpp2
-rw-r--r--src/devices/video/tlc34076.cpp2
-rw-r--r--src/devices/video/tms34061.cpp4
-rw-r--r--src/devices/video/tms3556.cpp6
-rw-r--r--src/devices/video/tms9927.cpp10
-rw-r--r--src/devices/video/tms9928a.cpp16
-rw-r--r--src/devices/video/tms9928a.h9
-rw-r--r--src/devices/video/upd3301.cpp4
-rw-r--r--src/devices/video/upd7220.cpp4
-rw-r--r--src/devices/video/upd7227.cpp2
-rw-r--r--src/devices/video/v9938.cpp4
-rw-r--r--src/devices/video/v9938.h9
-rw-r--r--src/devices/video/vector.cpp2
-rw-r--r--src/devices/video/vic4567.cpp5
-rw-r--r--src/devices/video/vooddefs.h8
-rw-r--r--src/devices/video/voodoo.cpp12
-rw-r--r--src/devices/video/voodoo_pci.cpp5
-rw-r--r--src/devices/video/zeus2.cpp2
1561 files changed, 3683 insertions, 3288 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp
index 8e0d024ebf1..39bf0c52489 100644
--- a/src/devices/bus/a1bus/a1bus.cpp
+++ b/src/devices/bus/a1bus/a1bus.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>;
+const device_type A1BUS_SLOT = device_creator<a1bus_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -59,7 +59,7 @@ void a1bus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A1BUS = &device_creator<a1bus_device>;
+const device_type A1BUS = device_creator<a1bus_device>;
void a1bus_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index f5802111084..3d499339314 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -21,7 +21,7 @@
#define CASSETTE_ROM_REGION "casrom"
-const device_type A1BUS_CASSETTE = &device_creator<a1bus_cassette_device>;
+const device_type A1BUS_CASSETTE = device_creator<a1bus_cassette_device>;
/* sound output */
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index ba6bc5935c1..f53270cd1df 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -22,7 +22,7 @@
#define CFFA_ROM_REGION "cffa_rom"
#define CFFA_ATA_TAG "cffa_ata"
-const device_type A1BUS_CFFA = &device_creator<a1bus_cffa_device>;
+const device_type A1BUS_CFFA = device_creator<a1bus_cffa_device>;
MACHINE_CONFIG_FRAGMENT( cffa )
MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false)
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index fb392196652..faa6e6d7bd8 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "a2alfam2.h"
#include "sound/sn76496.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
@@ -21,8 +22,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ALFAM2 = &device_creator<a2bus_alfam2_device>;
-const device_type A2BUS_AESMS = &device_creator<a2bus_aesms_device>;
+const device_type A2BUS_ALFAM2 = device_creator<a2bus_alfam2_device>;
+const device_type A2BUS_AESMS = device_creator<a2bus_aesms_device>;
#define SN1_TAG "sn76489_1" // left
#define SN2_TAG "sn76489_2" // center
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 5aefeb35a4f..f24903138dc 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_APPLICARD = &device_creator<a2bus_applicard_device>;
+const device_type A2BUS_APPLICARD = device_creator<a2bus_applicard_device>;
#define Z80_TAG "z80"
#define Z80_ROM_REGION "z80_rom"
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 31d86d7bddc..68da2e73426 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "a2arcadebd.h"
+#include "speaker.h"
/***************************************************************************
@@ -29,7 +30,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ARCADEBOARD = &device_creator<a2bus_arcboard_device>;
+const device_type A2BUS_ARCADEBOARD = device_creator<a2bus_arcboard_device>;
MACHINE_CONFIG_FRAGMENT( arcadeboard )
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp
index b1c97c08693..c20a2120b54 100644
--- a/src/devices/bus/a2bus/a2bus.cpp
+++ b/src/devices/bus/a2bus/a2bus.cpp
@@ -78,7 +78,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>;
+const device_type A2BUS_SLOT = device_creator<a2bus_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -121,7 +121,7 @@ void a2bus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS = &device_creator<a2bus_device>;
+const device_type A2BUS = device_creator<a2bus_device>;
void a2bus_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index e8f6cb5087d..b3fb2d51fd7 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -27,8 +27,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CFFA2 = &device_creator<a2bus_cffa2_device>;
-const device_type A2BUS_CFFA2_6502 = &device_creator<a2bus_cffa2_6502_device>;
+const device_type A2BUS_CFFA2 = device_creator<a2bus_cffa2_device>;
+const device_type A2BUS_CFFA2_6502 = device_creator<a2bus_cffa2_6502_device>;
#define CFFA2_ROM_REGION "cffa2_rom"
#define CFFA2_ATA_TAG "cffa2_ata"
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index bcb4a554d02..7c399b215f4 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -52,7 +52,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVUS = &device_creator<a2bus_corvus_device>;
+const device_type A2BUS_CORVUS = device_creator<a2bus_corvus_device>;
#define CORVUS_ROM_REGION "corvus_rom"
#define CORVUS_HD_TAG "corvushd"
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index fa89dfc228e..a32ec42430b 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -23,8 +23,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DISKII = &device_creator<a2bus_diskii_device>;
-const device_type A2BUS_IWM_FDC = &device_creator<a2bus_iwmflop_device>;
+const device_type A2BUS_DISKII = device_creator<a2bus_diskii_device>;
+const device_type A2BUS_IWM_FDC = device_creator<a2bus_iwmflop_device>;
#define DISKII_ROM_REGION "diskii_rom"
#define FDC_TAG "diskii_fdc"
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index 749bd0000c0..a1ebc3fb3c1 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DISKIING = &device_creator<a2bus_diskiing_device>;
+const device_type A2BUS_DISKIING = device_creator<a2bus_diskiing_device>;
#define WOZFDC_TAG "wozfdc"
#define DISKII_ROM_REGION "diskii_rom"
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index 76629c1b9f0..16b68bb2e81 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "a2dx1.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
@@ -20,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DX1 = &device_creator<a2bus_dx1_device>;
+const device_type A2BUS_DX1 = device_creator<a2bus_dx1_device>;
MACHINE_CONFIG_FRAGMENT( a2dx1 )
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index e8588f31260..8fc2f7a8137 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
+const device_type A2EAUXSLOT_SLOT = device_creator<a2eauxslot_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -61,7 +61,7 @@ void a2eauxslot_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUXSLOT = &device_creator<a2eauxslot_device>;
+const device_type A2EAUXSLOT = device_creator<a2eauxslot_device>;
void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index 698138dff84..3803af3fce4 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "a2echoii.h"
#include "sound/tms5220.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
@@ -20,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ECHOII = &device_creator<a2bus_echoii_device>;
+const device_type A2BUS_ECHOII = device_creator<a2bus_echoii_device>;
#define TMS_TAG "tms5220"
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index bd975354314..d7732804f58 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>;
+const device_type A2EAUX_EXT80COL = device_creator<a2eaux_ext80col_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index e832bb53123..587165e81e4 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>;
+const device_type A2EAUX_RAMWORKS3 = device_creator<a2eaux_ramworks3_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index 28a669ffd20..a32b6750c77 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>;
+const device_type A2EAUX_STD80COL = device_creator<a2eaux_std80col_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index 166a436b1a1..7584c73d836 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -51,7 +51,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_HSSCSI = &device_creator<a2bus_hsscsi_device>;
+const device_type A2BUS_HSSCSI = device_creator<a2bus_hsscsi_device>;
#define SCSI_ROM_REGION "scsi_rom"
#define SCSI_BUS_TAG "scsibus"
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index 5eb27c226da..891bc51c0a0 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "a2mcms.h"
+#include "speaker.h"
// the actual sound device (a slot device can't currently also be a sound device so we keep this private here)
enum
@@ -22,7 +23,7 @@ enum
};
-const device_type MCMS = &device_creator<mcms_device>;
+const device_type MCMS = device_creator<mcms_device>;
/***************************************************************************
PARAMETERS
@@ -32,8 +33,8 @@ const device_type MCMS = &device_creator<mcms_device>;
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MCMS1 = &device_creator<a2bus_mcms1_device>;
-const device_type A2BUS_MCMS2 = &device_creator<a2bus_mcms2_device>;
+const device_type A2BUS_MCMS1 = device_creator<a2bus_mcms1_device>;
+const device_type A2BUS_MCMS2 = device_creator<a2bus_mcms2_device>;
#define ENGINE_TAG "engine"
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index 32ac041e397..ebd2bb4dc9a 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -20,8 +20,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MEMEXP = &device_creator<a2bus_memexpapple_device>;
-const device_type A2BUS_RAMFACTOR = &device_creator<a2bus_ramfactor_device>;
+const device_type A2BUS_MEMEXP = device_creator<a2bus_memexpapple_device>;
+const device_type A2BUS_RAMFACTOR = device_creator<a2bus_ramfactor_device>;
#define MEMEXP_ROM_REGION "memexp_rom"
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index d4cd774255f..f8a9df64e8d 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MIDI = &device_creator<a2bus_midi_device>;
+const device_type A2BUS_MIDI = device_creator<a2bus_midi_device>;
#define MIDI_PTM_TAG "midi_ptm"
#define MIDI_ACIA_TAG "midi_acia"
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 565f1a472f7..98c33c6fd09 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "a2mockingboard.h"
+#include "speaker.h"
/***************************************************************************
@@ -29,9 +30,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MOCKINGBOARD = &device_creator<a2bus_mockingboard_device>;
-const device_type A2BUS_PHASOR = &device_creator<a2bus_phasor_device>;
-const device_type A2BUS_ECHOPLUS = &device_creator<a2bus_echoplus_device>;
+const device_type A2BUS_MOCKINGBOARD = device_creator<a2bus_mockingboard_device>;
+const device_type A2BUS_PHASOR = device_creator<a2bus_phasor_device>;
+const device_type A2BUS_ECHOPLUS = device_creator<a2bus_echoplus_device>;
MACHINE_CONFIG_FRAGMENT( mockingboard )
MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727)
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 0ae18d51d8f..d05842a7269 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_PIC = &device_creator<a2bus_pic_device>;
+const device_type A2BUS_PIC = device_creator<a2bus_pic_device>;
#define PIC_ROM_REGION "pic_rom"
#define PIC_CENTRONICS_TAG "pic_ctx"
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 971a398ed8d..322be844267 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "a2sam.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
@@ -20,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SAM = &device_creator<a2bus_sam_device>;
+const device_type A2BUS_SAM = device_creator<a2bus_sam_device>;
MACHINE_CONFIG_FRAGMENT( a2sam )
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 1cc446936bb..00e0c27bb11 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -44,7 +44,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SCSI = &device_creator<a2bus_scsi_device>;
+const device_type A2BUS_SCSI = device_creator<a2bus_scsi_device>;
#define SCSI_ROM_REGION "scsi_rom"
#define SCSI_BUS_TAG "scsibus"
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index 620d836587f..3051755dc0f 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SOFTCARD = &device_creator<a2bus_softcard_device>;
+const device_type A2BUS_SOFTCARD = device_creator<a2bus_softcard_device>;
#define Z80_TAG "z80"
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index fe6557e9cf1..aa8f28f48be 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SSC = &device_creator<a2bus_ssc_device>;
+const device_type A2BUS_SSC = device_creator<a2bus_ssc_device>;
#define SSC_ROM_REGION "ssc_rom"
#define SSC_ACIA_TAG "ssc_acia"
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index ec6ef5af5f7..8ccdf8bb928 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SWYFT = &device_creator<a2bus_swyft_device>;
+const device_type A2BUS_SWYFT = device_creator<a2bus_swyft_device>;
#define SWYFT_ROM_REGION "swyft_rom"
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index 9f28491d7e4..dd935cf2554 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -36,7 +36,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_THEMILL = &device_creator<a2bus_themill_device>;
+const device_type A2BUS_THEMILL = device_creator<a2bus_themill_device>;
#define M6809_TAG "m6809"
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index 8de8b73d67f..18a6f22abf1 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -36,7 +36,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_THUNDERCLOCK = &device_creator<a2bus_thunderclock_device>;
+const device_type A2BUS_THUNDERCLOCK = device_creator<a2bus_thunderclock_device>;
#define THUNDERCLOCK_ROM_REGION "thunclk_rom"
#define THUNDERCLOCK_UPD1990_TAG "thunclk_upd"
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 763f816a756..3edeeaf8cdd 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -29,6 +29,7 @@
#include "emu.h"
#include "a2ultraterm.h"
+#include "screen.h"
/***************************************************************************
@@ -39,8 +40,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ULTRATERM = &device_creator<a2bus_ultraterm_device>;
-const device_type A2BUS_ULTRATERMENH = &device_creator<a2bus_ultratermenh_device>;
+const device_type A2BUS_ULTRATERM = device_creator<a2bus_ultraterm_device>;
+const device_type A2BUS_ULTRATERMENH = device_creator<a2bus_ultratermenh_device>;
#define ULTRATERM_ROM_REGION "uterm_rom"
#define ULTRATERM_GFX_REGION "uterm_gfx"
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 01850c1b4bb..1cfb4552313 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -25,6 +25,7 @@
#include "emu.h"
#include "a2videoterm.h"
+#include "screen.h"
/***************************************************************************
@@ -35,12 +36,12 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_VIDEOTERM = &device_creator<a2bus_videoterm_device>;
-const device_type A2BUS_IBSAP16 = &device_creator<a2bus_ap16_device>;
-const device_type A2BUS_IBSAP16ALT = &device_creator<a2bus_ap16alt_device>;
-const device_type A2BUS_VTC1 = &device_creator<a2bus_vtc1_device>;
-const device_type A2BUS_VTC2 = &device_creator<a2bus_vtc2_device>;
-const device_type A2BUS_AEVIEWMASTER80 = &device_creator<a2bus_aevm80_device>;
+const device_type A2BUS_VIDEOTERM = device_creator<a2bus_videoterm_device>;
+const device_type A2BUS_IBSAP16 = device_creator<a2bus_ap16_device>;
+const device_type A2BUS_IBSAP16ALT = device_creator<a2bus_ap16alt_device>;
+const device_type A2BUS_VTC1 = device_creator<a2bus_vtc1_device>;
+const device_type A2BUS_VTC2 = device_creator<a2bus_vtc2_device>;
+const device_type A2BUS_AEVIEWMASTER80 = device_creator<a2bus_aevm80_device>;
#define VIDEOTERM_ROM_REGION "vterm_rom"
#define VIDEOTERM_GFX_REGION "vterm_gfx"
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index b7f9aa896b9..cefc12850bc 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -62,8 +62,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_VULCAN = &device_creator<a2bus_vulcan_device>;
-const device_type A2BUS_VULCANGOLD = &device_creator<a2bus_vulcangold_device>;
+const device_type A2BUS_VULCAN = device_creator<a2bus_vulcan_device>;
+const device_type A2BUS_VULCANGOLD = device_creator<a2bus_vulcangold_device>;
#define VULCAN_ROM_REGION "vulcan_rom"
#define VULCAN_ATA_TAG "vulcan_ata"
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index cc95c8dd1d5..a3220476cda 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -28,7 +28,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ZIPDRIVE = &device_creator<a2bus_zipdrive_device>;
+const device_type A2BUS_ZIPDRIVE = device_creator<a2bus_zipdrive_device>;
#define ZIPDRIVE_ROM_REGION "zipdrive_rom"
#define ZIPDRIVE_ATA_TAG "zipdrive_ata"
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 2c1d7667a57..e6badc3238a 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVFDC01 = &device_creator<a2bus_corvfdc01_device>;
+const device_type A2BUS_CORVFDC01 = device_creator<a2bus_corvfdc01_device>;
#define FDC01_ROM_REGION "fdc01_rom"
#define FDC01_FDC_TAG "fdc01_fdc"
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index bac61d8d249..a65726629cb 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVFDC02 = &device_creator<a2bus_corvfdc02_device>;
+const device_type A2BUS_CORVFDC02 = device_creator<a2bus_corvfdc02_device>;
#define FDC02_ROM_REGION "fdc02_rom"
#define FDC02_FDC_TAG "fdc02_fdc"
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index e8dc74df028..82b403d251a 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -25,9 +25,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_EZCGI = &device_creator<a2bus_ezcgi_device>;
-const device_type A2BUS_EZCGI_9938 = &device_creator<a2bus_ezcgi_9938_device>;
-const device_type A2BUS_EZCGI_9958 = &device_creator<a2bus_ezcgi_9958_device>;
+const device_type A2BUS_EZCGI = device_creator<a2bus_ezcgi_device>;
+const device_type A2BUS_EZCGI_9938 = device_creator<a2bus_ezcgi_9938_device>;
+const device_type A2BUS_EZCGI_9958 = device_creator<a2bus_ezcgi_9958_device>;
MACHINE_CONFIG_FRAGMENT( ezcgi )
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 781e55c76fd..4cfe11e52ec 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_LASER128 = &device_creator<a2bus_laser128_device>;
+const device_type A2BUS_LASER128 = device_creator<a2bus_laser128_device>;
MACHINE_CONFIG_FRAGMENT( a2laser128 )
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 003b783a6df..c332fce3d65 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -83,7 +83,7 @@
GLOBAL VARIABLES
***************************************************************************/
-const device_type A2BUS_MOUSE = &device_creator<a2bus_mouse_device>;
+const device_type A2BUS_MOUSE = device_creator<a2bus_mouse_device>;
static MACHINE_CONFIG_FRAGMENT( mouse )
MCFG_CPU_ADD(MOUSE_MCU_TAG, M68705P3, 2043600)
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 38927016f72..d7fda07f316 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -79,6 +79,7 @@
#include "emu.h"
#include "pc_xporter.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
@@ -88,7 +89,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_PCXPORTER = &device_creator<a2bus_pcxporter_device>;
+const device_type A2BUS_PCXPORTER = device_creator<a2bus_pcxporter_device>;
static ADDRESS_MAP_START( pc_map, AS_PROGRAM, 16, a2bus_pcxporter_device )
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index 39932634d88..49221a28ce9 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -21,7 +21,7 @@
#include "bus/pc_kbd/pc_kbdc.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 1fabbc1c51e..6697c6ac9ab 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>;
+const device_type A2BUS_RAMCARD128K = device_creator<a2bus_ssramcard_device>;
/***************************************************************************
FUNCTION PROTOTYPES
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index ef2108ed14e..22978a214af 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/src/devices/bus/a2bus/ramcard16k.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>;
+const device_type A2BUS_RAMCARD16K = device_creator<a2bus_ramcard_device>;
/***************************************************************************
FUNCTION PROTOTYPES
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 7790744a2b0..7eee31eb768 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -46,7 +46,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_TIMEMASTERHO = &device_creator<a2bus_timemasterho_device>;
+const device_type A2BUS_TIMEMASTERHO = device_creator<a2bus_timemasterho_device>;
#define TIMEMASTER_ROM_REGION "timemst_rom"
#define TIMEMASTER_PIA_TAG "timemst_pia"
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp
index c4c50f8972a..7cf7765a273 100644
--- a/src/devices/bus/a7800/a78_slot.cpp
+++ b/src/devices/bus/a7800/a78_slot.cpp
@@ -33,7 +33,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A78_CART_SLOT = &device_creator<a78_cart_slot_device>;
+const device_type A78_CART_SLOT = device_creator<a78_cart_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 6d044bcc13c..cc63d13b9c8 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -28,16 +28,17 @@
#include "emu.h"
#include "cpuwiz.h"
+#include "speaker.h"
//-------------------------------------------------
// constructor
//-------------------------------------------------
-const device_type A78_ROM_VERSABOARD = &device_creator<a78_versaboard_device>;
-const device_type A78_ROM_MEGACART = &device_creator<a78_megacart_device>;
+const device_type A78_ROM_VERSABOARD = device_creator<a78_versaboard_device>;
+const device_type A78_ROM_MEGACART = device_creator<a78_megacart_device>;
-const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>;
+const device_type A78_ROM_P450_VB = device_creator<a78_rom_p450_vb_device>;
a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp
index 381e6475d30..e78147c2f46 100644
--- a/src/devices/bus/a7800/hiscore.cpp
+++ b/src/devices/bus/a7800/hiscore.cpp
@@ -17,7 +17,7 @@
// constructor
//-------------------------------------------------
-const device_type A78_HISCORE = &device_creator<a78_hiscore_device>;
+const device_type A78_HISCORE = device_creator<a78_hiscore_device>;
a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index b55445aa691..8604ddf92f5 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -20,27 +20,28 @@
#include "emu.h"
#include "rom.h"
+#include "speaker.h"
//-------------------------------------------------
// constructor
//-------------------------------------------------
-const device_type A78_ROM = &device_creator<a78_rom_device>;
-const device_type A78_ROM_SG = &device_creator<a78_rom_sg_device>;
-const device_type A78_ROM_POKEY = &device_creator<a78_rom_pokey_device>;
-const device_type A78_ROM_SG_POKEY = &device_creator<a78_rom_sg_pokey_device>;
-const device_type A78_ROM_SG_RAM = &device_creator<a78_rom_sg_ram_device>;
-const device_type A78_ROM_SG9 = &device_creator<a78_rom_sg9_device>;
-const device_type A78_ROM_MRAM = &device_creator<a78_rom_mram_device>;
-const device_type A78_ROM_ABSOLUTE = &device_creator<a78_rom_abs_device>;
-const device_type A78_ROM_ACTIVISION = &device_creator<a78_rom_act_device>;
-
-
-const device_type A78_ROM_P450 = &device_creator<a78_rom_p450_device>;
-const device_type A78_ROM_P450_POKEY = &device_creator<a78_rom_p450_pokey_device>;
-const device_type A78_ROM_P450_SG_RAM = &device_creator<a78_rom_p450_sg_ram_device>;
-const device_type A78_ROM_P450_SG9 = &device_creator<a78_rom_p450_sg9_device>;
+const device_type A78_ROM = device_creator<a78_rom_device>;
+const device_type A78_ROM_SG = device_creator<a78_rom_sg_device>;
+const device_type A78_ROM_POKEY = device_creator<a78_rom_pokey_device>;
+const device_type A78_ROM_SG_POKEY = device_creator<a78_rom_sg_pokey_device>;
+const device_type A78_ROM_SG_RAM = device_creator<a78_rom_sg_ram_device>;
+const device_type A78_ROM_SG9 = device_creator<a78_rom_sg9_device>;
+const device_type A78_ROM_MRAM = device_creator<a78_rom_mram_device>;
+const device_type A78_ROM_ABSOLUTE = device_creator<a78_rom_abs_device>;
+const device_type A78_ROM_ACTIVISION = device_creator<a78_rom_act_device>;
+
+
+const device_type A78_ROM_P450 = device_creator<a78_rom_p450_device>;
+const device_type A78_ROM_P450_POKEY = device_creator<a78_rom_p450_pokey_device>;
+const device_type A78_ROM_P450_SG_RAM = device_creator<a78_rom_p450_sg_ram_device>;
+const device_type A78_ROM_P450_SG9 = device_creator<a78_rom_p450_sg9_device>;
a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index 422cd0a740e..5e3737aee61 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -46,14 +46,15 @@
#include "emu.h"
#include "xboard.h"
#include "a78_carts.h"
+#include "speaker.h"
//-------------------------------------------------
// constructor
//-------------------------------------------------
-const device_type A78_XBOARD = &device_creator<a78_xboard_device>;
-const device_type A78_XM = &device_creator<a78_xm_device>;
+const device_type A78_XBOARD = device_creator<a78_xboard_device>;
+const device_type A78_XM = device_creator<a78_xm_device>;
a78_xboard_device::a78_xboard_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)
diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp
index f8bcc0d877f..ee0ca68d790 100644
--- a/src/devices/bus/a800/a800_slot.cpp
+++ b/src/devices/bus/a800/a800_slot.cpp
@@ -29,9 +29,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A800_CART_SLOT = &device_creator<a800_cart_slot_device>;
-const device_type A5200_CART_SLOT = &device_creator<a5200_cart_slot_device>;
-const device_type XEGS_CART_SLOT = &device_creator<xegs_cart_slot_device>;
+const device_type A800_CART_SLOT = device_creator<a800_cart_slot_device>;
+const device_type A5200_CART_SLOT = device_creator<a5200_cart_slot_device>;
+const device_type XEGS_CART_SLOT = device_creator<xegs_cart_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp
index d6c8dbe7e3f..403ea833bb0 100644
--- a/src/devices/bus/a800/a8sio.cpp
+++ b/src/devices/bus/a800/a8sio.cpp
@@ -39,7 +39,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>;
+const device_type A8SIO_SLOT = device_creator<a8sio_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -87,7 +87,7 @@ void a8sio_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A8SIO = &device_creator<a8sio_device>;
+const device_type A8SIO = device_creator<a8sio_device>;
//**************************************************************************
diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp
index 7ff511bd0d7..bb35bea187a 100644
--- a/src/devices/bus/a800/cassette.cpp
+++ b/src/devices/bus/a800/cassette.cpp
@@ -25,7 +25,7 @@ TODO:
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A8SIO_CASSETTE = &device_creator<a8sio_cassette_device>;
+const device_type A8SIO_CASSETTE = device_creator<a8sio_cassette_device>;
const device_timer_id TIMER_CASSETTE_READ = 1;
static MACHINE_CONFIG_FRAGMENT( cassette )
diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp
index 2e2af58c0f0..6d0977cfdd3 100644
--- a/src/devices/bus/a800/oss.cpp
+++ b/src/devices/bus/a800/oss.cpp
@@ -15,10 +15,10 @@
// constructor
//-------------------------------------------------
-const device_type A800_ROM_OSS8K = &device_creator<a800_rom_oss8k_device>;
-const device_type A800_ROM_OSS34 = &device_creator<a800_rom_oss34_device>;
-const device_type A800_ROM_OSS43 = &device_creator<a800_rom_oss43_device>;
-const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>;
+const device_type A800_ROM_OSS8K = device_creator<a800_rom_oss8k_device>;
+const device_type A800_ROM_OSS34 = device_creator<a800_rom_oss34_device>;
+const device_type A800_ROM_OSS43 = device_creator<a800_rom_oss43_device>;
+const device_type A800_ROM_OSS91 = device_creator<a800_rom_oss91_device>;
a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp
index a3625fa754c..ff7730ecae9 100644
--- a/src/devices/bus/a800/rom.cpp
+++ b/src/devices/bus/a800/rom.cpp
@@ -18,16 +18,16 @@
// constructor
//-------------------------------------------------
-const device_type A800_ROM = &device_creator<a800_rom_device>;
-const device_type A800_ROM_BBSB = &device_creator<a800_rom_bbsb_device>;
-const device_type A800_ROM_WILLIAMS = &device_creator<a800_rom_williams_device>;
-const device_type A800_ROM_EXPRESS = &device_creator<a800_rom_express_device>;
-const device_type A800_ROM_TURBO = &device_creator<a800_rom_turbo_device>;
-const device_type A800_ROM_TELELINK2 = &device_creator<a800_rom_telelink2_device>;
-const device_type A800_ROM_MICROCALC = &device_creator<a800_rom_microcalc_device>;
-const device_type XEGS_ROM = &device_creator<xegs_rom_device>;
-const device_type A5200_ROM_2CHIPS = &device_creator<a5200_rom_2chips_device>;
-const device_type A5200_ROM_BBSB = &device_creator<a5200_rom_bbsb_device>;
+const device_type A800_ROM = device_creator<a800_rom_device>;
+const device_type A800_ROM_BBSB = device_creator<a800_rom_bbsb_device>;
+const device_type A800_ROM_WILLIAMS = device_creator<a800_rom_williams_device>;
+const device_type A800_ROM_EXPRESS = device_creator<a800_rom_express_device>;
+const device_type A800_ROM_TURBO = device_creator<a800_rom_turbo_device>;
+const device_type A800_ROM_TELELINK2 = device_creator<a800_rom_telelink2_device>;
+const device_type A800_ROM_MICROCALC = device_creator<a800_rom_microcalc_device>;
+const device_type XEGS_ROM = device_creator<xegs_rom_device>;
+const device_type A5200_ROM_2CHIPS = device_creator<a5200_rom_2chips_device>;
+const device_type A5200_ROM_BBSB = device_creator<a5200_rom_bbsb_device>;
a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp
index 55639200485..b02443d6aed 100644
--- a/src/devices/bus/a800/sparta.cpp
+++ b/src/devices/bus/a800/sparta.cpp
@@ -15,7 +15,7 @@
// constructor
//-------------------------------------------------
-const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device>;
+const device_type A800_ROM_SPARTADOS = device_creator<a800_rom_spartados_device>;
a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index b4338853270..3cb4d468ba9 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -15,12 +15,12 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC890 = &device_creator<abc890_t>;
-const device_type ABC_EXPANSION_UNIT = &device_creator<abc_expansion_unit_t>;
-const device_type ABC894 = &device_creator<abc894_t>;
-const device_type ABC850 = &device_creator<abc850_t>;
-const device_type ABC852 = &device_creator<abc852_t>;
-const device_type ABC856 = &device_creator<abc856_t>;
+const device_type ABC890 = device_creator<abc890_t>;
+const device_type ABC_EXPANSION_UNIT = device_creator<abc_expansion_unit_t>;
+const device_type ABC894 = device_creator<abc894_t>;
+const device_type ABC850 = device_creator<abc850_t>;
+const device_type ABC852 = device_creator<abc852_t>;
+const device_type ABC856 = device_creator<abc856_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index 9487730474f..855a52824d9 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ABCBUS_SLOT = &device_creator<abcbus_slot_t>;
+const device_type ABCBUS_SLOT = device_creator<abcbus_slot_t>;
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index eb6379703e0..021c1427fd5 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -95,10 +95,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_DEVICES_ABCBUS_ABCBUS_H
+#define MAME_DEVICES_ABCBUS_ABCBUS_H
-#ifndef __ABCBUS__
-#define __ABCBUS__
+#pragma once
@@ -310,9 +310,9 @@ SLOT_INTERFACE_EXTERN( abcbus_cards );
SLOT_INTERFACE_EXTERN( abc1600bus_cards );
-typedef device_type_iterator<&device_creator<abcbus_slot_t>, abcbus_slot_t> abcbus_slot_device_iterator;
+typedef device_type_iterator<ABCBUS_SLOT, abcbus_slot_t> abcbus_slot_device_iterator;
-#endif
+#endif // MAME_DEVICES_ABCBUS_ABCBUS_H
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index d57a1c1c53f..9f2688149e8 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -55,7 +55,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_FD2 = &device_creator<abc_fd2_t>;
+const device_type ABC_FD2 = device_creator<abc_fd2_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 7029c2b4a8e..9e69ced4ad3 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_HDC = &device_creator<abc_hdc_device>;
+const device_type ABC_HDC = device_creator<abc_hdc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index a48236e727b..42960d2e918 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -139,7 +139,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LUXOR_55_10828 = &device_creator<luxor_55_10828_device>;
+const device_type LUXOR_55_10828 = device_creator<luxor_55_10828_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 3df7402180a..588cf8b77df 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -94,12 +94,12 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LUXOR_55_21046 = &device_creator<luxor_55_21046_t>;
-const device_type ABC830 = &device_creator<abc830_t>;
-const device_type ABC832 = &device_creator<abc832_t>;
-const device_type ABC834 = &device_creator<abc834_t>;
-const device_type ABC838 = &device_creator<abc838_device>;
-const device_type ABC850_FLOPPY = &device_creator<abc850_floppy_t>;
+const device_type LUXOR_55_21046 = device_creator<luxor_55_21046_t>;
+const device_type ABC830 = device_creator<abc830_t>;
+const device_type ABC832 = device_creator<abc832_t>;
+const device_type ABC834 = device_creator<abc834_t>;
+const device_type ABC838 = device_creator<abc838_device>;
+const device_type ABC850_FLOPPY = device_creator<abc850_floppy_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index 9095f29332c..1cebd0f9258 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -94,7 +94,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LUXOR_55_21056 = &device_creator<luxor_55_21056_device>;
+const device_type LUXOR_55_21056 = device_creator<luxor_55_21056_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 2798607dfcc..4ffdf711756 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LUXOR_4105 = &device_creator<luxor_4105_device>;
+const device_type LUXOR_4105 = device_creator<luxor_4105_device>;
WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy )
diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp
index ba22a8e1a62..32ac9a9cf42 100644
--- a/src/devices/bus/abcbus/memcard.cpp
+++ b/src/devices/bus/abcbus/memcard.cpp
@@ -63,7 +63,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_MEMORY_CARD = &device_creator<abc_memory_card_t>;
+const device_type ABC_MEMORY_CARD = device_creator<abc_memory_card_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp
index 5df5c00bd5f..07739a75f40 100644
--- a/src/devices/bus/abcbus/ram.cpp
+++ b/src/devices/bus/abcbus/ram.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC80_16KB_RAM_CARD = &device_creator<abc80_16kb_ram_card_t>;
+const device_type ABC80_16KB_RAM_CARD = device_creator<abc80_16kb_ram_card_t>;
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index 8342283445f..e99d51f61a6 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -48,7 +48,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_SIO = &device_creator<abc_sio_device>;
+const device_type ABC_SIO = device_creator<abc_sio_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp
index b13dce4bcc9..9dead4049f3 100644
--- a/src/devices/bus/abcbus/slutprov.cpp
+++ b/src/devices/bus/abcbus/slutprov.cpp
@@ -9,7 +9,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_SLUTPROV = &device_creator<abc_slutprov_device>;
+const device_type ABC_SLUTPROV = device_creator<abc_slutprov_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp
index 760cdf6aaa4..d552f8e40e9 100644
--- a/src/devices/bus/abcbus/turbo.cpp
+++ b/src/devices/bus/abcbus/turbo.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TURBO_KONTROLLER = &device_creator<turbo_kontroller_device>;
+const device_type TURBO_KONTROLLER = device_creator<turbo_kontroller_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp
index fc6e36b66e3..5bdc0e68661 100644
--- a/src/devices/bus/abcbus/uni800.cpp
+++ b/src/devices/bus/abcbus/uni800.cpp
@@ -40,7 +40,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC_UNI800 = &device_creator<abc_uni800_device>;
+const device_type ABC_UNI800 = device_creator<abc_uni800_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index 7a29e4035bc..f81542c8b94 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -43,6 +43,7 @@ Notes:
#include "emu.h"
#include "abc77.h"
+#include "speaker.h"
@@ -59,8 +60,8 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC77 = &device_creator<abc77_device>;
-const device_type ABC55 = &device_creator<abc55_device>;
+const device_type ABC77 = device_creator<abc77_device>;
+const device_type ABC55 = device_creator<abc55_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
index fc2972a7adf..8776885cad0 100644
--- a/src/devices/bus/abckb/abc77.h
+++ b/src/devices/bus/abckb/abc77.h
@@ -6,16 +6,17 @@
*********************************************************************/
+#ifndef MAME_BUS_ABCKB_ABC77_H
+#define MAME_BUS_ABCKB_ABC77_H
+
#pragma once
-#ifndef __ABC77__
-#define __ABC77__
+#include "abckb.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/watchdog.h"
-#include "abckb.h"
#include "sound/discrete.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
@@ -102,5 +103,4 @@ extern const device_type ABC77;
extern const device_type ABC55;
-
-#endif
+#endif // MAME_BUS_ABCKB_ABC77_H
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index f0b4a215c7e..7a8a07162d9 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -85,7 +85,7 @@ XR22-050-3B Pinout
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC800_KEYBOARD = &device_creator<abc800_keyboard_device>;
+const device_type ABC800_KEYBOARD = device_creator<abc800_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index 488194fd452..299f3f63d6a 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -54,6 +54,7 @@ Notes:
#include "emu.h"
#include "abc99.h"
+#include "speaker.h"
@@ -70,7 +71,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC99 = &device_creator<abc99_device>;
+const device_type ABC99 = device_creator<abc99_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
index 631194a83e7..c9278fe8acc 100644
--- a/src/devices/bus/abckb/abc99.h
+++ b/src/devices/bus/abckb/abc99.h
@@ -6,14 +6,15 @@
*********************************************************************/
+#ifndef MAME_BUS_ABCKB_ABC99_H
+#define MAME_BUS_ABCKB_ABC99_H
+
#pragma once
-#ifndef __ABC99__
-#define __ABC99__
+#include "abckb.h"
#include "cpu/mcs48/mcs48.h"
-#include "abckb.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
@@ -109,5 +110,4 @@ private:
extern const device_type ABC99;
-
-#endif
+#endif // MAME_BUS_ABCKB_ABC99_H
diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp
index 4c03c430df2..fd0478f54ef 100644
--- a/src/devices/bus/abckb/abckb.cpp
+++ b/src/devices/bus/abckb/abckb.cpp
@@ -16,7 +16,7 @@
//**************************************************************************
// device type definition
-const device_type ABC_KEYBOARD_PORT = &device_creator<abc_keyboard_port_device>;
+const device_type ABC_KEYBOARD_PORT = device_creator<abc_keyboard_port_device>;
diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp
index c9b810e2494..d4144d430e6 100644
--- a/src/devices/bus/adam/adamlink.cpp
+++ b/src/devices/bus/adam/adamlink.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAMLINK = &device_creator<adamlink_device>;
+const device_type ADAMLINK = device_creator<adamlink_device>;
diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp
index 2e58564fcd0..5d9d8dbd4b3 100644
--- a/src/devices/bus/adam/exp.cpp
+++ b/src/devices/bus/adam/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_EXPANSION_SLOT = &device_creator<adam_expansion_slot_device>;
+const device_type ADAM_EXPANSION_SLOT = device_creator<adam_expansion_slot_device>;
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index 68d7477cc6d..b49777663c4 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -35,7 +35,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_IDE = &device_creator<powermate_ide_device>;
+const device_type ADAM_IDE = device_creator<powermate_ide_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp
index 8922b441a42..5f627cd46fc 100644
--- a/src/devices/bus/adam/ram.cpp
+++ b/src/devices/bus/adam/ram.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_RAM = &device_creator<adam_ram_expansion_device>;
+const device_type ADAM_RAM = device_creator<adam_ram_expansion_device>;
diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp
index c153a826f67..17a38148196 100644
--- a/src/devices/bus/adamnet/adamnet.cpp
+++ b/src/devices/bus/adamnet/adamnet.cpp
@@ -15,8 +15,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ADAMNET = &device_creator<adamnet_device>;
-const device_type ADAMNET_SLOT = &device_creator<adamnet_slot_device>;
+const device_type ADAMNET = device_creator<adamnet_device>;
+const device_type ADAMNET_SLOT = device_creator<adamnet_slot_device>;
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index 27cb93de3e1..27bc97b3816 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_DDP = &device_creator<adam_digital_data_pack_device>;
+const device_type ADAM_DDP = device_creator<adam_digital_data_pack_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index 776e431a51e..c2cf39ec7f7 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -34,7 +34,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_FDC = &device_creator<adam_fdc_device>;
+const device_type ADAM_FDC = device_creator<adam_fdc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 867b68f6394..2f52e88a700 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_KB = &device_creator<adam_keyboard_device>;
+const device_type ADAM_KB = device_creator<adam_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 55ff7d8155e..6c2a609c1e5 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_PRN = &device_creator<adam_printer_device>;
+const device_type ADAM_PRN = device_creator<adam_printer_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index d9b1278db6f..1fe2fbaf6cf 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ADAM_SPI = &device_creator<adam_spi_device>;
+const device_type ADAM_SPI = device_creator<adam_spi_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index c9588ca0a8a..3b0278c62cf 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -23,7 +23,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-device_type const A1200_KBD = &device_creator<bus::amiga::keyboard::a1200_kbd_device>;
+device_type const A1200_KBD = device_creator<bus::amiga::keyboard::a1200_kbd_device>;
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index 266728e6b5e..1ee353763dd 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -20,16 +20,16 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type A500_KBD_US = &device_creator<bus::amiga::keyboard::a500_kbd_us_device>;
-const device_type A500_KBD_DE = &device_creator<bus::amiga::keyboard::a500_kbd_de_device>;
-const device_type A500_KBD_FR = &device_creator<bus::amiga::keyboard::a500_kbd_fr_device>;
-const device_type A500_KBD_IT = &device_creator<bus::amiga::keyboard::a500_kbd_it_device>;
-const device_type A500_KBD_SE = &device_creator<bus::amiga::keyboard::a500_kbd_se_device>;
-const device_type A500_KBD_ES = &device_creator<bus::amiga::keyboard::a500_kbd_es_device>;
-const device_type A500_KBD_DK = &device_creator<bus::amiga::keyboard::a500_kbd_dk_device>;
-const device_type A500_KBD_CH = &device_creator<bus::amiga::keyboard::a500_kbd_ch_device>;
-const device_type A500_KBD_NO = &device_creator<bus::amiga::keyboard::a500_kbd_no_device>;
-const device_type A500_KBD_GB = &device_creator<bus::amiga::keyboard::a500_kbd_gb_device>;
+const device_type A500_KBD_US = device_creator<bus::amiga::keyboard::a500_kbd_us_device>;
+const device_type A500_KBD_DE = device_creator<bus::amiga::keyboard::a500_kbd_de_device>;
+const device_type A500_KBD_FR = device_creator<bus::amiga::keyboard::a500_kbd_fr_device>;
+const device_type A500_KBD_IT = device_creator<bus::amiga::keyboard::a500_kbd_it_device>;
+const device_type A500_KBD_SE = device_creator<bus::amiga::keyboard::a500_kbd_se_device>;
+const device_type A500_KBD_ES = device_creator<bus::amiga::keyboard::a500_kbd_es_device>;
+const device_type A500_KBD_DK = device_creator<bus::amiga::keyboard::a500_kbd_dk_device>;
+const device_type A500_KBD_CH = device_creator<bus::amiga::keyboard::a500_kbd_ch_device>;
+const device_type A500_KBD_NO = device_creator<bus::amiga::keyboard::a500_kbd_no_device>;
+const device_type A500_KBD_GB = device_creator<bus::amiga::keyboard::a500_kbd_gb_device>;
namespace bus { namespace amiga { namespace keyboard {
diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp
index 1c1d037e227..169fbb05448 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.cpp
+++ b/src/devices/bus/amiga/keyboard/keyboard.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type AMIGA_KEYBOARD_INTERFACE = &device_creator<amiga_keyboard_bus_device>;
+const device_type AMIGA_KEYBOARD_INTERFACE = device_creator<amiga_keyboard_bus_device>;
//**************************************************************************
diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp
index 5a02f8e70dd..d0f777b333b 100644
--- a/src/devices/bus/amiga/zorro/a2052.cpp
+++ b/src/devices/bus/amiga/zorro/a2052.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type A2052 = &device_creator<a2052_device>;
+const device_type A2052 = device_creator<a2052_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 2a70ed54d4d..19a8140f609 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type A2232 = &device_creator<a2232_device>;
+const device_type A2232 = device_creator<a2232_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 81b6ae79e6e..09c9a3cf73d 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -18,8 +18,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type A590 = &device_creator<a590_device>;
-const device_type A2091 = &device_creator<a2091_device>;
+const device_type A590 = device_creator<a590_device>;
+const device_type A2091 = device_creator<a2091_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 708101014d9..498f2516f9c 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -22,9 +22,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ACTION_REPLAY_MK1 = &device_creator<action_replay_mk1_device>;
-const device_type ACTION_REPLAY_MK2 = &device_creator<action_replay_mk2_device>;
-const device_type ACTION_REPLAY_MK3 = &device_creator<action_replay_mk3_device>;
+const device_type ACTION_REPLAY_MK1 = device_creator<action_replay_mk1_device>;
+const device_type ACTION_REPLAY_MK2 = device_creator<action_replay_mk2_device>;
+const device_type ACTION_REPLAY_MK3 = device_creator<action_replay_mk3_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 2162a2d914e..cc363a00d5d 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BUDDHA = &device_creator<buddha_device>;
+const device_type BUDDHA = device_creator<buddha_device>;
//-------------------------------------------------
// mmio_map - device-specific memory mapped I/O
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp
index f83ee8f194f..180f6091157 100644
--- a/src/devices/bus/amiga/zorro/zorro.cpp
+++ b/src/devices/bus/amiga/zorro/zorro.cpp
@@ -16,7 +16,7 @@
// ZORRO SLOT DEVICE
//**************************************************************************
-const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>;
+const device_type ZORRO_SLOT = device_creator<zorro_slot_device>;
//-------------------------------------------------
// zorro_slot_device - constructor
@@ -115,7 +115,7 @@ WRITE_LINE_MEMBER( zorro_device::int6_w ) { m_int6_handler(state); }
// EXPANSION SLOT DEVICE
//**************************************************************************
-const device_type EXP_SLOT = &device_creator<exp_slot_device>;
+const device_type EXP_SLOT = device_creator<exp_slot_device>;
//-------------------------------------------------
// exp_slot_device - constructor
@@ -181,7 +181,7 @@ void exp_slot_device::fc_w(int code) { if (m_dev) m_dev->fc_w(code); }
// ZORRO2 DEVICE
//**************************************************************************
-const device_type ZORRO2 = &device_creator<zorro2_device>;
+const device_type ZORRO2 = device_creator<zorro2_device>;
//-------------------------------------------------
// zorro2_device - constructor
diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp
index 041bdad74b3..616d4d42146 100644
--- a/src/devices/bus/apf/rom.cpp
+++ b/src/devices/bus/apf/rom.cpp
@@ -17,9 +17,9 @@
// apf_rom_device - constructor
//-------------------------------------------------
-const device_type APF_ROM_STD = &device_creator<apf_rom_device>;
-const device_type APF_ROM_BASIC = &device_creator<apf_basic_device>;
-const device_type APF_ROM_SPACEDST = &device_creator<apf_spacedst_device>;
+const device_type APF_ROM_STD = device_creator<apf_rom_device>;
+const device_type APF_ROM_BASIC = device_creator<apf_basic_device>;
+const device_type APF_ROM_SPACEDST = device_creator<apf_spacedst_device>;
apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp
index afe50d8a9b5..fb62fcf51d3 100644
--- a/src/devices/bus/apf/slot.cpp
+++ b/src/devices/bus/apf/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type APF_CART_SLOT = &device_creator<apf_cart_slot_device>;
+const device_type APF_CART_SLOT = device_creator<apf_cart_slot_device>;
//**************************************************************************
// APF Cartridges Interface
diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp
index f35fefd7ff4..8f99831b482 100644
--- a/src/devices/bus/apricot/expansion/expansion.cpp
+++ b/src/devices/bus/apricot/expansion/expansion.cpp
@@ -14,7 +14,7 @@
// EXPANSION SLOT DEVICE
//**************************************************************************
-const device_type APRICOT_EXPANSION_SLOT = &device_creator<apricot_expansion_slot_device>;
+const device_type APRICOT_EXPANSION_SLOT = device_creator<apricot_expansion_slot_device>;
//-------------------------------------------------
// apricot_expansion_slot_device - constructor
@@ -53,7 +53,7 @@ void apricot_expansion_slot_device::device_start()
// EXPANSION BUS DEVICE
//**************************************************************************
-const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_device>;
+const device_type APRICOT_EXPANSION_BUS = device_creator<apricot_expansion_bus_device>;
//-------------------------------------------------
// apricot_expansion_bus_device - constructor
diff --git a/src/devices/bus/apricot/expansion/ram.cpp b/src/devices/bus/apricot/expansion/ram.cpp
index 04477437269..46a5bee1543 100644
--- a/src/devices/bus/apricot/expansion/ram.cpp
+++ b/src/devices/bus/apricot/expansion/ram.cpp
@@ -14,9 +14,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type APRICOT_256K_RAM = &device_creator<apricot_256k_ram_device>;
-const device_type APRICOT_128K_RAM = &device_creator<apricot_128k_ram_device>;
-const device_type APRICOT_512K_RAM = &device_creator<apricot_512k_ram_device>;
+const device_type APRICOT_256K_RAM = device_creator<apricot_256k_ram_device>;
+const device_type APRICOT_128K_RAM = device_creator<apricot_128k_ram_device>;
+const device_type APRICOT_512K_RAM = device_creator<apricot_512k_ram_device>;
//**************************************************************************
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index 198d19f0e49..7fef733b134 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -58,7 +58,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type APRICOT_KEYBOARD_HLE = &device_creator<apricot_keyboard_hle_device>;
+const device_type APRICOT_KEYBOARD_HLE = device_creator<apricot_keyboard_hle_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp
index e2cf48601a3..e406c0c4cd5 100644
--- a/src/devices/bus/apricot/keyboard/keyboard.cpp
+++ b/src/devices/bus/apricot/keyboard/keyboard.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_bus_device>;
+const device_type APRICOT_KEYBOARD_INTERFACE = device_creator<apricot_keyboard_bus_device>;
//**************************************************************************
diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp
index 8009b229a68..73640851160 100644
--- a/src/devices/bus/arcadia/rom.cpp
+++ b/src/devices/bus/arcadia/rom.cpp
@@ -18,8 +18,8 @@
// arcadia_rom_device - constructor
//-------------------------------------------------
-const device_type ARCADIA_ROM_STD = &device_creator<arcadia_rom_device>;
-const device_type ARCADIA_ROM_GOLF = &device_creator<arcadia_golf_device>;
+const device_type ARCADIA_ROM_STD = device_creator<arcadia_rom_device>;
+const device_type ARCADIA_ROM_GOLF = device_creator<arcadia_golf_device>;
arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp
index f40788240ef..e4cc9b38851 100644
--- a/src/devices/bus/arcadia/slot.cpp
+++ b/src/devices/bus/arcadia/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type EA2001_CART_SLOT = &device_creator<arcadia_cart_slot_device>;
+const device_type EA2001_CART_SLOT = device_creator<arcadia_cart_slot_device>;
//**************************************************************************
// ARCADIA Cartridges Interface
diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp
index cf57dcee23d..3e67050ddc2 100644
--- a/src/devices/bus/astrocde/exp.cpp
+++ b/src/devices/bus/astrocde/exp.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ASTROCADE_EXP_SLOT = &device_creator<astrocade_exp_device>;
+const device_type ASTROCADE_EXP_SLOT = device_creator<astrocade_exp_device>;
device_astrocade_card_interface::device_astrocade_card_interface(const machine_config &mconfig, device_t &device)
diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp
index d10b006c224..89d16e6de77 100644
--- a/src/devices/bus/astrocde/ram.cpp
+++ b/src/devices/bus/astrocde/ram.cpp
@@ -60,12 +60,12 @@
// astrocade_rom_device - constructor
//-------------------------------------------------
-const device_type ASTROCADE_BLUERAM_4K = &device_creator<astrocade_blueram_4k_device>;
-const device_type ASTROCADE_BLUERAM_16K = &device_creator<astrocade_blueram_16k_device>;
-const device_type ASTROCADE_BLUERAM_32K = &device_creator<astrocade_blueram_32k_device>;
-const device_type ASTROCADE_VIPER_SYS1 = &device_creator<astrocade_viper_sys1_device>;
-const device_type ASTROCADE_WHITERAM = &device_creator<astrocade_whiteram_device>;
-const device_type ASTROCADE_RL64RAM = &device_creator<astrocade_rl64ram_device>;
+const device_type ASTROCADE_BLUERAM_4K = device_creator<astrocade_blueram_4k_device>;
+const device_type ASTROCADE_BLUERAM_16K = device_creator<astrocade_blueram_16k_device>;
+const device_type ASTROCADE_BLUERAM_32K = device_creator<astrocade_blueram_32k_device>;
+const device_type ASTROCADE_VIPER_SYS1 = device_creator<astrocade_viper_sys1_device>;
+const device_type ASTROCADE_WHITERAM = device_creator<astrocade_whiteram_device>;
+const device_type ASTROCADE_RL64RAM = device_creator<astrocade_rl64ram_device>;
astrocade_blueram_4k_device::astrocade_blueram_4k_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)
diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp
index 335b45338ea..c5edddd7d3a 100644
--- a/src/devices/bus/astrocde/rom.cpp
+++ b/src/devices/bus/astrocde/rom.cpp
@@ -17,9 +17,9 @@
// astrocade_rom_device - constructor
//-------------------------------------------------
-const device_type ASTROCADE_ROM_STD = &device_creator<astrocade_rom_device>;
-const device_type ASTROCADE_ROM_256K = &device_creator<astrocade_rom_256k_device>;
-const device_type ASTROCADE_ROM_512K = &device_creator<astrocade_rom_512k_device>;
+const device_type ASTROCADE_ROM_STD = device_creator<astrocade_rom_device>;
+const device_type ASTROCADE_ROM_256K = device_creator<astrocade_rom_256k_device>;
+const device_type ASTROCADE_ROM_512K = device_creator<astrocade_rom_512k_device>;
astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp
index 294b7d0a2be..b1e9840c7c1 100644
--- a/src/devices/bus/astrocde/slot.cpp
+++ b/src/devices/bus/astrocde/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ASTROCADE_CART_SLOT = &device_creator<astrocade_cart_slot_device>;
+const device_type ASTROCADE_CART_SLOT = device_creator<astrocade_cart_slot_device>;
//**************************************************************************
// Astrocade Cartridges Interface
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
index d791aeb9f87..273025a5ce9 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_1MHZBUS_SLOT = &device_creator<bbc_1mhzbus_slot_device>;
+const device_type BBC_1MHZBUS_SLOT = device_creator<bbc_1mhzbus_slot_device>;
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index 406ce778fc8..ca748a4763f 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -45,7 +45,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_OPUS3 = &device_creator<bbc_opus3_device>;
+const device_type BBC_OPUS3 = device_creator<bbc_opus3_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/analogue/analogue.cpp b/src/devices/bus/bbc/analogue/analogue.cpp
index 1177fbd37a7..726f869771c 100644
--- a/src/devices/bus/bbc/analogue/analogue.cpp
+++ b/src/devices/bus/bbc/analogue/analogue.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_ANALOGUE_SLOT = &device_creator<bbc_analogue_slot_device>;
+const device_type BBC_ANALOGUE_SLOT = device_creator<bbc_analogue_slot_device>;
diff --git a/src/devices/bus/bbc/analogue/joystick.cpp b/src/devices/bus/bbc/analogue/joystick.cpp
index 4be67fd84a6..8c6aa767af6 100644
--- a/src/devices/bus/bbc/analogue/joystick.cpp
+++ b/src/devices/bus/bbc/analogue/joystick.cpp
@@ -18,8 +18,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_ACORNJOY = &device_creator<bbc_acornjoy_device>;
-const device_type BBC_VOLTMACE3B = &device_creator<bbc_voltmace3b_device>;
+const device_type BBC_ACORNJOY = device_creator<bbc_acornjoy_device>;
+const device_type BBC_VOLTMACE3B = device_creator<bbc_voltmace3b_device>;
static INPUT_PORTS_START( acornjoy )
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 92840858374..45a13a5dc18 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -15,8 +15,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_ACORN8271 = &device_creator<bbc_acorn8271_device>;
-const device_type BBC_ACORN1770 = &device_creator<bbc_acorn1770_device>;
+const device_type BBC_ACORN8271 = device_creator<bbc_acorn8271_device>;
+const device_type BBC_ACORN1770 = device_creator<bbc_acorn1770_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index c5bd476e2c1..ca36e75a2da 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -17,8 +17,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_CUMANA1 = &device_creator<bbc_cumana1_device>;
-const device_type BBC_CUMANA2 = &device_creator<bbc_cumana2_device>;
+const device_type BBC_CUMANA1 = device_creator<bbc_cumana1_device>;
+const device_type BBC_CUMANA2 = device_creator<bbc_cumana2_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp
index cd262df345c..58bbfc416e3 100644
--- a/src/devices/bus/bbc/fdc/fdc.cpp
+++ b/src/devices/bus/bbc/fdc/fdc.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_FDC_SLOT = &device_creator<bbc_fdc_slot_device>;
+const device_type BBC_FDC_SLOT = device_creator<bbc_fdc_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index 3e8f1bd9496..ccc75650925 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -20,9 +20,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_OPUS2791 = &device_creator<bbc_opus2791_device>;
-const device_type BBC_OPUS2793 = &device_creator<bbc_opus2793_device>;
-const device_type BBC_OPUS1770 = &device_creator<bbc_opus1770_device>;
+const device_type BBC_OPUS2791 = device_creator<bbc_opus2791_device>;
+const device_type BBC_OPUS2793 = device_creator<bbc_opus2793_device>;
+const device_type BBC_OPUS1770 = device_creator<bbc_opus1770_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 38dc71049bf..158e7c9a9c3 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -19,8 +19,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_WEDDB2 = &device_creator<bbc_weddb2_device>;
-const device_type BBC_WEDDB3 = &device_creator<bbc_weddb3_device>;
+const device_type BBC_WEDDB2 = device_creator<bbc_weddb2_device>;
+const device_type BBC_WEDDB3 = device_creator<bbc_weddb3_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp
index 5af727eb4f1..872aa0cb5f0 100644
--- a/src/devices/bus/bbc/joyport/joyport.cpp
+++ b/src/devices/bus/bbc/joyport/joyport.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_JOYPORT_SLOT = &device_creator<bbc_joyport_slot_device>;
+const device_type BBC_JOYPORT_SLOT = device_creator<bbc_joyport_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp
index e6c4b22b401..d4eecd8acaf 100644
--- a/src/devices/bus/bbc/joyport/joystick.cpp
+++ b/src/devices/bus/bbc/joyport/joystick.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBCMC_JOYSTICK = &device_creator<bbcmc_joystick_device>;
+const device_type BBCMC_JOYSTICK = device_creator<bbcmc_joystick_device>;
static INPUT_PORTS_START( joystick )
diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp
index c242c5a8d69..694cecfc2f3 100644
--- a/src/devices/bus/bbc/tube/tube.cpp
+++ b/src/devices/bus/bbc/tube/tube.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BBC_TUBE_SLOT = &device_creator<bbc_tube_slot_device>;
+const device_type BBC_TUBE_SLOT = device_creator<bbc_tube_slot_device>;
diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp
index f466c84a395..ed6858a20a6 100644
--- a/src/devices/bus/bbc/userport/userport.cpp
+++ b/src/devices/bus/bbc/userport/userport.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BBC_USERPORT_SLOT = &device_creator<bbc_userport_device>;
+const device_type BBC_USERPORT_SLOT = device_creator<bbc_userport_device>;
diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp
index 200d1fc63b5..8bbc443672a 100644
--- a/src/devices/bus/bml3/bml3bus.cpp
+++ b/src/devices/bus/bml3/bml3bus.cpp
@@ -50,7 +50,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>;
+const device_type BML3BUS_SLOT = device_creator<bml3bus_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -93,7 +93,7 @@ void bml3bus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BML3BUS = &device_creator<bml3bus_device>;
+const device_type BML3BUS = device_creator<bml3bus_device>;
void bml3bus_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp
index b426dc664da..753b0665f19 100644
--- a/src/devices/bus/bml3/bml3kanji.cpp
+++ b/src/devices/bus/bml3/bml3kanji.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BML3BUS_KANJI = &device_creator<bml3bus_kanji_device>;
+const device_type BML3BUS_KANJI = device_creator<bml3bus_kanji_device>;
#define KANJI_ROM_REGION "kanji_rom"
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index 595d3b97a9f..201e28b87fc 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BML3BUS_MP1802 = &device_creator<bml3bus_mp1802_device>;
+const device_type BML3BUS_MP1802 = device_creator<bml3bus_mp1802_device>;
static SLOT_INTERFACE_START( mp1802_floppies )
SLOT_INTERFACE("dd", FLOPPY_525_DD)
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index b4358c60fe7..dc8b9e58551 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BML3BUS_MP1805 = &device_creator<bml3bus_mp1805_device>;
+const device_type BML3BUS_MP1805 = device_creator<bml3bus_mp1805_device>;
static const floppy_interface bml3_mp1805_floppy_interface =
{
diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp
index 826380110cb..4002d5df709 100644
--- a/src/devices/bus/bw2/exp.cpp
+++ b/src/devices/bus/bw2/exp.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type BW2_EXPANSION_SLOT = &device_creator<bw2_expansion_slot_device>;
+const device_type BW2_EXPANSION_SLOT = device_creator<bw2_expansion_slot_device>;
diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp
index a40a238edbb..6e66de49933 100644
--- a/src/devices/bus/bw2/ramcard.cpp
+++ b/src/devices/bus/bw2/ramcard.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type BW2_RAMCARD = &device_creator<bw2_ramcard_device>;
+const device_type BW2_RAMCARD = device_creator<bw2_ramcard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index 87c5580f56d..4c5520950ce 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_16KB = &device_creator<c64_16kb_cartridge_device>;
+const device_type C64_16KB = device_creator<c64_16kb_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp
index 9328f853637..3cd731215fd 100644
--- a/src/devices/bus/c64/4dxh.cpp
+++ b/src/devices/bus/c64/4dxh.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_4DXH = &device_creator<c64_4dxh_device>;
+const device_type C64_4DXH = device_creator<c64_4dxh_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp
index a7ca6ac6f4c..a3f47f48405 100644
--- a/src/devices/bus/c64/4ksa.cpp
+++ b/src/devices/bus/c64/4ksa.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_4KSA = &device_creator<c64_4ksa_device>;
+const device_type C64_4KSA = device_creator<c64_4ksa_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp
index 3d140deb696..7f4adc76bce 100644
--- a/src/devices/bus/c64/4tba.cpp
+++ b/src/devices/bus/c64/4tba.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_4TBA = &device_creator<c64_4tba_device>;
+const device_type C64_4TBA = device_creator<c64_4tba_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index 852e7d4860f..bd3fc5a270b 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_BN1541 = &device_creator<c64_bn1541_device>;
+const device_type C64_BN1541 = device_creator<c64_bn1541_device>;
diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp
index 6085a6e9166..9f0e8a03954 100644
--- a/src/devices/bus/c64/c128_comal80.cpp
+++ b/src/devices/bus/c64/c128_comal80.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C128_COMAL80 = &device_creator<c128_comal80_cartridge_device>;
+const device_type C128_COMAL80 = device_creator<c128_comal80_cartridge_device>;
diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp
index 18fce1fbbaa..3be09f7f258 100644
--- a/src/devices/bus/c64/c128_partner.cpp
+++ b/src/devices/bus/c64/c128_partner.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C128_PARTNER = &device_creator<partner128_t>;
+const device_type C128_PARTNER = device_creator<partner128_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp
index 47647290949..f3421510012 100644
--- a/src/devices/bus/c64/comal80.cpp
+++ b/src/devices/bus/c64/comal80.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>;
+const device_type C64_COMAL80 = device_creator<c64_comal80_cartridge_device>;
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index 0da1f1e2813..8544938255a 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -33,7 +33,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_CPM = &device_creator<c64_cpm_cartridge_device>;
+const device_type C64_CPM = device_creator<c64_cpm_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index a92877bc196..8acdd0c8498 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -69,6 +69,7 @@ Notes:
#include "emu.h"
#include "currah_speech.h"
+#include "speaker.h"
@@ -84,7 +85,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_CURRAH_SPEECH = &device_creator<c64_currah_speech_cartridge_device>;
+const device_type C64_CURRAH_SPEECH = device_creator<c64_currah_speech_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index a4ce5b8df79..2dd9c890d44 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_DELA_EP256 = &device_creator<c64_dela_ep256_cartridge_device>;
+const device_type C64_DELA_EP256 = device_creator<c64_dela_ep256_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index 3a70145d609..65c371a1f8f 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_DELA_EP64 = &device_creator<c64_dela_ep64_cartridge_device>;
+const device_type C64_DELA_EP64 = device_creator<c64_dela_ep64_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index 3c6012b57af..eae8c4ae34b 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_DELA_EP7X8 = &device_creator<c64_dela_ep7x8_cartridge_device>;
+const device_type C64_DELA_EP7X8 = device_creator<c64_dela_ep7x8_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp
index 3cebd073deb..ada3ca405ee 100644
--- a/src/devices/bus/c64/dinamic.cpp
+++ b/src/devices/bus/c64/dinamic.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>;
+const device_type C64_DINAMIC = device_creator<c64_dinamic_cartridge_device>;
diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp
index ab49e6106f2..31458acb9a2 100644
--- a/src/devices/bus/c64/dqbb.cpp
+++ b/src/devices/bus/c64/dqbb.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>;
+const device_type C64_DQBB = device_creator<c64_dqbb_cartridge_device>;
diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp
index ad197f6daff..dd24e20d013 100644
--- a/src/devices/bus/c64/easy_calc_result.cpp
+++ b/src/devices/bus/c64/easy_calc_result.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_cartridge_device>;
+const device_type C64_EASY_CALC_RESULT = device_creator<c64_easy_calc_result_cartridge_device>;
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index 7e247f9c4b3..edc7c4c3cff 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_EASYFLASH = &device_creator<c64_easyflash_cartridge_device>;
+const device_type C64_EASYFLASH = device_creator<c64_easyflash_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp
index 7bb627120ac..75e4f7e2a35 100644
--- a/src/devices/bus/c64/epyx_fast_load.cpp
+++ b/src/devices/bus/c64/epyx_fast_load.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartridge_device>;
+const device_type C64_EPYX_FAST_LOAD = device_creator<c64_epyx_fast_load_cartridge_device>;
diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp
index b769f06a106..5c2d51d864a 100644
--- a/src/devices/bus/c64/exos.cpp
+++ b/src/devices/bus/c64/exos.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_EXOS = &device_creator<c64_exos_cartridge_device>;
+const device_type C64_EXOS = device_creator<c64_exos_cartridge_device>;
diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp
index 3d4159b10af..96718ceefc7 100644
--- a/src/devices/bus/c64/exp.cpp
+++ b/src/devices/bus/c64/exp.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_EXPANSION_SLOT = &device_creator<c64_expansion_slot_device>;
+const device_type C64_EXPANSION_SLOT = device_creator<c64_expansion_slot_device>;
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 890c2ecfd5f..8bd0986ff04 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_FCC = &device_creator<c64_final_chesscard_device>;
+const device_type C64_FCC = device_creator<c64_final_chesscard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp
index 07c85db5b62..0c756ddecbd 100644
--- a/src/devices/bus/c64/final.cpp
+++ b/src/devices/bus/c64/final.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_FINAL = &device_creator<c64_final_cartridge_device>;
+const device_type C64_FINAL = device_creator<c64_final_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp
index 12c68483d1b..4226cb981c8 100644
--- a/src/devices/bus/c64/final3.cpp
+++ b/src/devices/bus/c64/final3.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_FINAL3 = &device_creator<c64_final3_cartridge_device>;
+const device_type C64_FINAL3 = device_creator<c64_final3_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp
index 02abc5c909f..c675ae763de 100644
--- a/src/devices/bus/c64/fun_play.cpp
+++ b/src/devices/bus/c64/fun_play.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>;
+const device_type C64_FUN_PLAY = device_creator<c64_fun_play_cartridge_device>;
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index 2827ecc3585..7640251306f 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_GEOCABLE = &device_creator<c64_geocable_device>;
+const device_type C64_GEOCABLE = device_creator<c64_geocable_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp
index e06ef40bcf3..c68efcc2a80 100644
--- a/src/devices/bus/c64/georam.cpp
+++ b/src/devices/bus/c64/georam.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>;
+const device_type C64_GEORAM = device_creator<c64_georam_cartridge_device>;
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 5139b0bf31f..cd49717a148 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -39,7 +39,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_IDE64 = &device_creator<c64_ide64_cartridge_device>;
+const device_type C64_IDE64 = device_creator<c64_ide64_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index 547e3a8787a..8e57f6ef007 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_IEEE488 = &device_creator<c64_ieee488_device>;
+const device_type C64_IEEE488 = device_creator<c64_ieee488_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp
index 4a6d001d384..6716028f634 100644
--- a/src/devices/bus/c64/kingsoft.cpp
+++ b/src/devices/bus/c64/kingsoft.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_KINGSOFT = &device_creator<c64_kingsoft_cartridge_device>;
+const device_type C64_KINGSOFT = device_creator<c64_kingsoft_cartridge_device>;
diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp
index b4069b1fa31..ff16f80ee4f 100644
--- a/src/devices/bus/c64/mach5.cpp
+++ b/src/devices/bus/c64/mach5.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MACH5 = &device_creator<c64_mach5_cartridge_device>;
+const device_type C64_MACH5 = device_creator<c64_mach5_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp
index 3de61c7507c..a1ad9614530 100644
--- a/src/devices/bus/c64/magic_desk.cpp
+++ b/src/devices/bus/c64/magic_desk.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_device>;
+const device_type C64_MAGIC_DESK = device_creator<c64_magic_desk_cartridge_device>;
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index 9e22f899caf..0812e2aaeba 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MAGIC_FORMEL = &device_creator<c64_magic_formel_cartridge_device>;
+const device_type C64_MAGIC_FORMEL = device_creator<c64_magic_formel_cartridge_device>;
WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w )
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index 8f46919561d..b973f87a0c4 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -41,6 +41,7 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html
#include "emu.h"
#include "magic_voice.h"
+#include "speaker.h"
@@ -65,7 +66,7 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MAGIC_VOICE = &device_creator<c64_magic_voice_cartridge_device>;
+const device_type C64_MAGIC_VOICE = device_creator<c64_magic_voice_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 84bd4b89b3c..092c0ff76db 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIDI_MAPLIN = &device_creator<c64_maplin_midi_cartridge_device>;
+const device_type C64_MIDI_MAPLIN = device_creator<c64_maplin_midi_cartridge_device>;
WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::acia_irq_w )
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index 65863317a84..6ef20e74b41 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIDI_NAMESOFT = &device_creator<c64_namesoft_midi_cartridge_device>;
+const device_type C64_MIDI_NAMESOFT = device_creator<c64_namesoft_midi_cartridge_device>;
WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::acia_irq_w )
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index 01cb4ce0e63..4c229129112 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIDI_PASSPORT = &device_creator<c64_passport_midi_cartridge_device>;
+const device_type C64_MIDI_PASSPORT = device_creator<c64_passport_midi_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index 33846c6d5b6..120dd875be4 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIDI_SCI = &device_creator<c64_sequential_midi_cartridge_device>;
+const device_type C64_MIDI_SCI = device_creator<c64_sequential_midi_cartridge_device>;
WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::acia_irq_w )
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index ff5bf42e0ad..cb1b4e1a9c1 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIDI_SIEL = &device_creator<c64_siel_midi_cartridge_device>;
+const device_type C64_MIDI_SIEL = device_creator<c64_siel_midi_cartridge_device>;
WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::acia_irq_w )
diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp
index e5ac7c004fb..18f7bcd2772 100644
--- a/src/devices/bus/c64/mikro_assembler.cpp
+++ b/src/devices/bus/c64/mikro_assembler.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MIKRO_ASSEMBLER = &device_creator<c64_mikro_assembler_cartridge_device>;
+const device_type C64_MIKRO_ASSEMBLER = device_creator<c64_mikro_assembler_cartridge_device>;
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index 7434dc425e2..37c077a1606 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -78,7 +78,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MULTISCREEN = &device_creator<c64_multiscreen_cartridge_device>;
+const device_type C64_MULTISCREEN = device_creator<c64_multiscreen_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 98039ff46d7..3c886b60935 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_MUSIC64 = &device_creator<c64_music64_cartridge_device>;
+const device_type C64_MUSIC64 = device_creator<c64_music64_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp
index 7ff3a4d182d..f0686a9f077 100644
--- a/src/devices/bus/c64/neoram.cpp
+++ b/src/devices/bus/c64/neoram.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>;
+const device_type C64_NEORAM = device_creator<c64_neoram_cartridge_device>;
diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp
index 8b792422283..a6d3d17cc1b 100644
--- a/src/devices/bus/c64/ocean.cpp
+++ b/src/devices/bus/c64/ocean.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_OCEAN = &device_creator<c64_ocean_cartridge_device>;
+const device_type C64_OCEAN = device_creator<c64_ocean_cartridge_device>;
diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp
index e3a890df6a1..837e3ada595 100644
--- a/src/devices/bus/c64/pagefox.cpp
+++ b/src/devices/bus/c64/pagefox.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>;
+const device_type C64_PAGEFOX = device_creator<c64_pagefox_cartridge_device>;
diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp
index b7b9875a9ee..b431bc02b94 100644
--- a/src/devices/bus/c64/partner.cpp
+++ b/src/devices/bus/c64/partner.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_PARTNER = &device_creator<c64_partner_cartridge_device>;
+const device_type C64_PARTNER = device_creator<c64_partner_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp
index bd9cf55b123..3a02de50eba 100644
--- a/src/devices/bus/c64/prophet64.cpp
+++ b/src/devices/bus/c64/prophet64.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_PROPHET64 = &device_creator<c64_prophet64_cartridge_device>;
+const device_type C64_PROPHET64 = device_creator<c64_prophet64_cartridge_device>;
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index 7fa0f361687..f12ef27280f 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -57,7 +57,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_PS64 = &device_creator<c64_ps64_cartridge_device>;
+const device_type C64_PS64 = device_creator<c64_ps64_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index 777336aa030..415bc8510db 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -22,9 +22,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_REU1700 = &device_creator<c64_reu1700_cartridge_device>;
-const device_type C64_REU1750 = &device_creator<c64_reu1750_cartridge_device>;
-const device_type C64_REU1764 = &device_creator<c64_reu1764_cartridge_device>;
+const device_type C64_REU1700 = device_creator<c64_reu1700_cartridge_device>;
+const device_type C64_REU1750 = device_creator<c64_reu1750_cartridge_device>;
+const device_type C64_REU1764 = device_creator<c64_reu1764_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp
index 81612627e03..08b357dbc41 100644
--- a/src/devices/bus/c64/rex.cpp
+++ b/src/devices/bus/c64/rex.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_REX = &device_creator<c64_rex_cartridge_device>;
+const device_type C64_REX = device_creator<c64_rex_cartridge_device>;
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index 0ccfd9fb3c8..7c93751ea10 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_REX_EP256 = &device_creator<c64_rex_ep256_cartridge_device>;
+const device_type C64_REX_EP256 = device_creator<c64_rex_ep256_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp
index fb5bde6f5cc..add7f50bbe2 100644
--- a/src/devices/bus/c64/ross.cpp
+++ b/src/devices/bus/c64/ross.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>;
+const device_type C64_ROSS = device_creator<c64_ross_cartridge_device>;
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 50b80fefd8f..b77dff2d61d 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "sfx_sound_expander.h"
+#include "speaker.h"
@@ -23,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SFX_SOUND_EXPANDER = &device_creator<c64_sfx_sound_expander_cartridge_device>;
+const device_type C64_SFX_SOUND_EXPANDER = device_creator<c64_sfx_sound_expander_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp
index 8907aa2f9b5..d780445f714 100644
--- a/src/devices/bus/c64/silverrock.cpp
+++ b/src/devices/bus/c64/silverrock.cpp
@@ -48,7 +48,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_device>;
+const device_type C64_SILVERROCK = device_creator<c64_silverrock_cartridge_device>;
diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp
index f7980d91221..5ced074bc7c 100644
--- a/src/devices/bus/c64/simons_basic.cpp
+++ b/src/devices/bus/c64/simons_basic.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SIMONS_BASIC = &device_creator<c64_simons_basic_cartridge_device>;
+const device_type C64_SIMONS_BASIC = device_creator<c64_simons_basic_cartridge_device>;
diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp
index 3a2d770eedd..41060e9b3bd 100644
--- a/src/devices/bus/c64/speakeasy.cpp
+++ b/src/devices/bus/c64/speakeasy.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "speakeasy.h"
+#include "speaker.h"
@@ -23,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SPEAKEASY = &device_creator<c64_speakeasy_t>;
+const device_type C64_SPEAKEASY = device_creator<c64_speakeasy_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp
index 9e258fdc73e..945d089f15d 100644
--- a/src/devices/bus/c64/stardos.cpp
+++ b/src/devices/bus/c64/stardos.cpp
@@ -44,7 +44,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_STARDOS = &device_creator<c64_stardos_cartridge_device>;
+const device_type C64_STARDOS = device_creator<c64_stardos_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp
index 045f8909eec..2b75507d9b6 100644
--- a/src/devices/bus/c64/std.cpp
+++ b/src/devices/bus/c64/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_STD = &device_creator<c64_standard_cartridge_device>;
+const device_type C64_STD = device_creator<c64_standard_cartridge_device>;
diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp
index 7d7597a763f..9e5580545df 100644
--- a/src/devices/bus/c64/structured_basic.cpp
+++ b/src/devices/bus/c64/structured_basic.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_cartridge_device>;
+const device_type C64_STRUCTURED_BASIC = device_creator<c64_structured_basic_cartridge_device>;
diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp
index 7dc5218b313..d535d1d066e 100644
--- a/src/devices/bus/c64/super_explode.cpp
+++ b/src/devices/bus/c64/super_explode.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridge_device>;
+const device_type C64_SUPER_EXPLODE = device_creator<c64_super_explode_cartridge_device>;
diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp
index 3ffadee981f..dde616c1719 100644
--- a/src/devices/bus/c64/super_games.cpp
+++ b/src/devices/bus/c64/super_games.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_device>;
+const device_type C64_SUPER_GAMES = device_creator<c64_super_games_cartridge_device>;
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index 80a2dea1bb3..256a184664b 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SUPERCPU = &device_creator<c64_supercpu_device>;
+const device_type C64_SUPERCPU = device_creator<c64_supercpu_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp
index a8a57726e53..024d6c0145c 100644
--- a/src/devices/bus/c64/sw8k.cpp
+++ b/src/devices/bus/c64/sw8k.cpp
@@ -38,7 +38,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SW8K = &device_creator<c64_switchable_8k_cartridge_device>;
+const device_type C64_SW8K = device_creator<c64_switchable_8k_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 6a44246b6b0..eeaa9677568 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SWIFTLINK = &device_creator<c64_swiftlink_cartridge_device>;
+const device_type C64_SWIFTLINK = device_creator<c64_swiftlink_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp
index b27e62c2f11..c7a72e4d4a2 100644
--- a/src/devices/bus/c64/system3.cpp
+++ b/src/devices/bus/c64/system3.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>;
+const device_type C64_SYSTEM3 = device_creator<c64_system3_cartridge_device>;
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index 0f53ad1e20e..276a1d8965e 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -146,7 +146,7 @@ BASIC commands (SYS 32768 to activate)
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_TDOS = &device_creator<c64_tdos_cartridge_device>;
+const device_type C64_TDOS = device_creator<c64_tdos_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index a61c24044dc..524cb98a26e 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -30,7 +30,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_TURBO232 = &device_creator<c64_turbo232_cartridge_device>;
+const device_type C64_TURBO232 = device_creator<c64_turbo232_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp
index e925760baad..bd16f5b70bb 100644
--- a/src/devices/bus/c64/vizastar.cpp
+++ b/src/devices/bus/c64/vizastar.cpp
@@ -47,7 +47,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_VIZASTAR = &device_creator<c64_vizastar_cartridge_device>;
+const device_type C64_VIZASTAR = device_creator<c64_vizastar_cartridge_device>;
diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp
index ceab25e531a..794aa210a8f 100644
--- a/src/devices/bus/c64/vw64.cpp
+++ b/src/devices/bus/c64/vw64.cpp
@@ -55,7 +55,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>;
+const device_type C64_VW64 = device_creator<c64_vizawrite_cartridge_device>;
diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp
index 8a56d562330..17ed11be1b3 100644
--- a/src/devices/bus/c64/warp_speed.cpp
+++ b/src/devices/bus/c64/warp_speed.cpp
@@ -49,7 +49,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_WARP_SPEED = &device_creator<c64_warp_speed_cartridge_device>;
+const device_type C64_WARP_SPEED = device_creator<c64_warp_speed_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp
index 5fdac6d6a5c..d977e493cb5 100644
--- a/src/devices/bus/c64/westermann.cpp
+++ b/src/devices/bus/c64/westermann.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_WESTERMANN = &device_creator<c64_westermann_cartridge_device>;
+const device_type C64_WESTERMANN = device_creator<c64_westermann_cartridge_device>;
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index f90823869bb..ef2891c68f4 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -38,6 +38,7 @@ Notes:
#include "emu.h"
#include "xl80.h"
+#include "screen.h"
@@ -56,7 +57,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_XL80 = &device_creator<c64_xl80_device>;
+const device_type C64_XL80 = device_creator<c64_xl80_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp
index 31005b9d73d..c6e5c1ef749 100644
--- a/src/devices/bus/c64/zaxxon.cpp
+++ b/src/devices/bus/c64/zaxxon.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>;
+const device_type C64_ZAXXON = device_creator<c64_zaxxon_cartridge_device>;
diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp
index d250dd5d454..e9e94d272a5 100644
--- a/src/devices/bus/cbm2/24k.cpp
+++ b/src/devices/bus/cbm2/24k.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM2_24K = &device_creator<cbm2_24k_cartridge_device>;
+const device_type CBM2_24K = device_creator<cbm2_24k_cartridge_device>;
diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index 7230b218105..130a72c804a 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM2_EXPANSION_SLOT = &device_creator<cbm2_expansion_slot_device>;
+const device_type CBM2_EXPANSION_SLOT = device_creator<cbm2_expansion_slot_device>;
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index 85183f05e6e..cc06bbb7f40 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -20,6 +20,7 @@
#include "emu.h"
#include "hrg.h"
+#include "screen.h"
@@ -37,8 +38,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM2_HRG_A = &device_creator<cbm2_hrg_a_t>;
-const device_type CBM2_HRG_B = &device_creator<cbm2_hrg_b_t>;
+const device_type CBM2_HRG_A = device_creator<cbm2_hrg_a_t>;
+const device_type CBM2_HRG_B = device_creator<cbm2_hrg_b_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp
index b87d10851ce..d795fd8837a 100644
--- a/src/devices/bus/cbm2/std.cpp
+++ b/src/devices/bus/cbm2/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM2_STD = &device_creator<cbm2_standard_cartridge_device>;
+const device_type CBM2_STD = device_creator<cbm2_standard_cartridge_device>;
diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp
index b8a976b9fd5..118b379abc8 100644
--- a/src/devices/bus/cbm2/user.cpp
+++ b/src/devices/bus/cbm2/user.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM2_USER_PORT = &device_creator<cbm2_user_port_device>;
+const device_type CBM2_USER_PORT = device_creator<cbm2_user_port_device>;
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index 003e1c0dec7..602d1f4b37e 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -23,9 +23,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C1526 = &device_creator<c1526_t>;
-const device_type MPS802 = &device_creator<c1526_t>;
-const device_type C4023 = &device_creator<c4023_t>;
+const device_type C1526 = device_creator<c1526_t>;
+const device_type MPS802 = device_creator<c1526_t>;
+const device_type C4023 = device_creator<c4023_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 03ca9e33bdf..9955cb5afeb 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -161,18 +161,18 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C1540 = &device_creator<c1540_t>;
-const device_type C1541 = &device_creator<c1541_t>;
-const device_type C1541C = &device_creator<c1541c_t>;
-const device_type C1541II = &device_creator<c1541ii_t>;
-const device_type SX1541 = &device_creator<sx1541_t>;
-const device_type FSD1 = &device_creator<fsd1_t>;
-const device_type FSD2 = &device_creator<fsd2_t>;
-const device_type CSD1 = &device_creator<csd1_t>;
-const device_type C1541_DOLPHIN_DOS = &device_creator<c1541_dolphin_dos_t>;
-const device_type C1541_PROFESSIONAL_DOS_V1 = &device_creator<c1541_professional_dos_v1_t>;
-const device_type C1541_PROLOGIC_DOS_CLASSIC = &device_creator<c1541_prologic_dos_classic_t>;
-const device_type INDUS_GT = &device_creator<indus_gt_t>;
+const device_type C1540 = device_creator<c1540_t>;
+const device_type C1541 = device_creator<c1541_t>;
+const device_type C1541C = device_creator<c1541c_t>;
+const device_type C1541II = device_creator<c1541ii_t>;
+const device_type SX1541 = device_creator<sx1541_t>;
+const device_type FSD1 = device_creator<fsd1_t>;
+const device_type FSD2 = device_creator<fsd2_t>;
+const device_type CSD1 = device_creator<csd1_t>;
+const device_type C1541_DOLPHIN_DOS = device_creator<c1541_dolphin_dos_t>;
+const device_type C1541_PROFESSIONAL_DOS_V1 = device_creator<c1541_professional_dos_v1_t>;
+const device_type C1541_PROLOGIC_DOS_CLASSIC = device_creator<c1541_prologic_dos_classic_t>;
+const device_type INDUS_GT = device_creator<indus_gt_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index edff95705c9..b1369d3cec9 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -44,10 +44,10 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C1570 = &device_creator<c1570_t>;
-const device_type C1571 = &device_creator<c1571_t>;
-const device_type C1571CR = &device_creator<c1571cr_t>;
-const device_type MINI_CHIEF = &device_creator<mini_chief_t>;
+const device_type C1570 = device_creator<c1570_t>;
+const device_type C1571 = device_creator<c1571_t>;
+const device_type C1571CR = device_creator<c1571cr_t>;
+const device_type MINI_CHIEF = device_creator<mini_chief_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 9e5d0998a99..eb48f99141d 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -33,8 +33,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C1563 = &device_creator<c1563_t>;
-const device_type C1581 = &device_creator<c1581_t>;
+const device_type C1563 = device_creator<c1563_t>;
+const device_type C1581 = device_creator<c1581_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index 4ff95426802..0288aa2874f 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_NL10_INTERFACE = &device_creator<c64_nl10_interface_device>;
+const device_type C64_NL10_INTERFACE = device_creator<c64_nl10_interface_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index be5295577a9..67276583fae 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -209,8 +209,8 @@ static const char *const SIGNAL_NAME[] = { "SRQ", "ATN", "CLK", "DATA", "RESET"
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM_IEC = &device_creator<cbm_iec_device>;
-const device_type CBM_IEC_SLOT = &device_creator<cbm_iec_slot_device>;
+const device_type CBM_IEC = device_creator<cbm_iec_device>;
+const device_type CBM_IEC_SLOT = device_creator<cbm_iec_slot_device>;
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 2b47254d0ac..b554c9bda71 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CMD_HD = &device_creator<cmd_hd_device>;
+const device_type CMD_HD = device_creator<cmd_hd_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index 2dfb4430fd4..7eb12763ef9 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopback_device>;
+const device_type DIAG264_SERIAL_LOOPBACK = device_creator<diag264_serial_loopback_device>;
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 6a3c0075f9a..92164c9299e 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -39,8 +39,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type FD2000 = &device_creator<fd2000_device>;
-const device_type FD4000 = &device_creator<fd4000_device>;
+const device_type FD2000 = device_creator<fd2000_device>;
+const device_type FD4000 = device_creator<fd4000_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index 6380622058d..796802ab95e 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -76,7 +76,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type INTERPOD = &device_creator<interpod_device>;
+const device_type INTERPOD = device_creator<interpod_device>;
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 1d32117543b..d47cf61a0dc 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -32,7 +32,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SERIAL_BOX = &device_creator<serial_box_device>;
+const device_type SERIAL_BOX = device_creator<serial_box_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index 005ef7ff337..77157cdea07 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1515 = &device_creator<vic1515_t>;
+const device_type VIC1515 = device_creator<vic1515_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index dc86dec9636..e2275224f1e 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -52,7 +52,7 @@ PD7 Y MOTOR COM D
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1520 = &device_creator<vic1520_t>;
+const device_type VIC1520 = device_creator<vic1520_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 6525e30c686..bdca08de3e6 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_PL80 = &device_creator<comx_pl80_device>;
+const device_type COMX_PL80 = device_creator<comx_pl80_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp
index b6f5b45fe69..1caea17daae 100644
--- a/src/devices/bus/centronics/covox.cpp
+++ b/src/devices/bus/centronics/covox.cpp
@@ -9,13 +9,14 @@
#include "emu.h"
#include "covox.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
//**************************************************************************
// COVOX DEVICE
//**************************************************************************
// device type definition
-const device_type CENTRONICS_COVOX = &device_creator<centronics_covox_device>;
+const device_type CENTRONICS_COVOX = device_creator<centronics_covox_device>;
static MACHINE_CONFIG_FRAGMENT( covox )
/* sound hardware */
@@ -67,7 +68,7 @@ void centronics_covox_device::update_dac()
//**************************************************************************
// device type definition
-const device_type CENTRONICS_COVOX_STEREO = &device_creator<centronics_covox_stereo_device>;
+const device_type CENTRONICS_COVOX_STEREO = device_creator<centronics_covox_stereo_device>;
static MACHINE_CONFIG_FRAGMENT( covox_stereo )
/* sound hardware */
diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp
index 211d5e34654..fd66f57d3ac 100644
--- a/src/devices/bus/centronics/ctronics.cpp
+++ b/src/devices/bus/centronics/ctronics.cpp
@@ -11,7 +11,7 @@
// class centronics_device
-const device_type CENTRONICS = &device_creator<centronics_device>;
+const device_type CENTRONICS = device_creator<centronics_device>;
centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__),
diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp
index cea44838ecc..006fbb5068b 100644
--- a/src/devices/bus/centronics/digiblst.cpp
+++ b/src/devices/bus/centronics/digiblst.cpp
@@ -9,13 +9,14 @@
#include "emu.h"
#include "digiblst.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
//**************************************************************************
// COVOX DEVICE
//**************************************************************************
// device type definition
-const device_type CENTRONICS_DIGIBLASTER = &device_creator<centronics_digiblaster_device>;
+const device_type CENTRONICS_DIGIBLASTER = device_creator<centronics_digiblaster_device>;
static MACHINE_CONFIG_FRAGMENT( digiblst )
/* sound hardware */
diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp
index b97125f48ed..7d1fa9dee78 100644
--- a/src/devices/bus/centronics/dsjoy.cpp
+++ b/src/devices/bus/centronics/dsjoy.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "dsjoy.h"
-const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator<dempa_shinbunsha_joystick_device>;
+const device_type DEMPA_SHINBUNSHA_JOYSTICK = device_creator<dempa_shinbunsha_joystick_device>;
dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, DEMPA_SHINBUNSHA_JOYSTICK, "Dempa Shinbunsha Joystick", tag, owner, clock, "dempa_shinbunsha_joystick", __FILE__),
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 2f7055b6a34..6c42844ca79 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -129,6 +129,7 @@ TODO: - The UPD7810 core is missing analog port emulation
#include "emu.h"
#include "epson_ex800.h"
+#include "speaker.h"
#include "ex800.lh"
@@ -170,7 +171,7 @@ TODO: - The UPD7810 core is missing analog port emulation
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EPSON_EX800 = &device_creator<epson_ex800_t>;
+const device_type EPSON_EX800 = device_creator<epson_ex800_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 0d043b46f09..7870d3c72da 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "epson_lx800.h"
+#include "speaker.h"
#include "lx800.lh"
@@ -24,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EPSON_LX800 = &device_creator<epson_lx800_t>;
+const device_type EPSON_LX800 = device_creator<epson_lx800_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index c4c00ebc8cf..65d423d49e0 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -28,6 +28,8 @@
#include "emu.h"
#include "epson_lx810l.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
//extern const char layout_lx800[]; /* use layout from lx800 */
@@ -42,8 +44,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EPSON_LX810L = &device_creator<epson_lx810l_t>;
-const device_type EPSON_AP2000 = &device_creator<epson_ap2000_t>;
+const device_type EPSON_LX810L = device_creator<epson_lx810l_t>;
+const device_type EPSON_AP2000 = device_creator<epson_ap2000_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index 0b06503bacd..1e0cbbc985a 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -9,7 +9,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEC_P72 = &device_creator<nec_p72_t>;
+const device_type NEC_P72 = device_creator<nec_p72_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp
index 3306cbf2d46..318ac9bd597 100644
--- a/src/devices/bus/centronics/printer.cpp
+++ b/src/devices/bus/centronics/printer.cpp
@@ -8,7 +8,7 @@
//**************************************************************************
// device type definition
-const device_type CENTRONICS_PRINTER = &device_creator<centronics_printer_device>;
+const device_type CENTRONICS_PRINTER = device_creator<centronics_printer_device>;
static MACHINE_CONFIG_FRAGMENT( centronics_printer )
diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp
index fe4e2357db7..ab7e083b84b 100644
--- a/src/devices/bus/cgenie/expansion/expansion.cpp
+++ b/src/devices/bus/cgenie/expansion/expansion.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EXPANSION_SLOT = &device_creator<expansion_slot_device>;
+const device_type EXPANSION_SLOT = device_creator<expansion_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index d8c2664a254..74abf332b50 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -28,7 +28,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CGENIE_FDC = &device_creator<cgenie_fdc_device>;
+const device_type CGENIE_FDC = device_creator<cgenie_fdc_device>;
DEVICE_ADDRESS_MAP_START( mmio, 8, cgenie_fdc_device )
AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x10) AM_READWRITE(irq_r, select_w)
diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp
index bc9c3be5a73..2e54551959a 100644
--- a/src/devices/bus/cgenie/parallel/joystick.cpp
+++ b/src/devices/bus/cgenie/parallel/joystick.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CGENIE_JOYSTICK = &device_creator<cgenie_joystick_device>;
+const device_type CGENIE_JOYSTICK = device_creator<cgenie_joystick_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index 9237f976938..2f993298755 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PARALLEL_SLOT = &device_creator<parallel_slot_device>;
+const device_type PARALLEL_SLOT = device_creator<parallel_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index ae26869a325..cd798e978d9 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -21,7 +21,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CGENIE_PRINTER = &device_creator<cgenie_printer_device>;
+const device_type CGENIE_PRINTER = device_creator<cgenie_printer_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp
index 9e2e0479e89..35e886aeb0d 100644
--- a/src/devices/bus/chanf/rom.cpp
+++ b/src/devices/bus/chanf/rom.cpp
@@ -23,12 +23,12 @@
// chanf_rom_device - constructor
//-------------------------------------------------
-const device_type CHANF_ROM_STD = &device_creator<chanf_rom_device>;
-const device_type CHANF_ROM_MAZE = &device_creator<chanf_maze_device>;
-const device_type CHANF_ROM_HANGMAN = &device_creator<chanf_hangman_device>;
-const device_type CHANF_ROM_CHESS = &device_creator<chanf_chess_device>;
-const device_type CHANF_ROM_MULTI_OLD = &device_creator<chanf_multi_old_device>;
-const device_type CHANF_ROM_MULTI_FINAL = &device_creator<chanf_multi_final_device>;
+const device_type CHANF_ROM_STD = device_creator<chanf_rom_device>;
+const device_type CHANF_ROM_MAZE = device_creator<chanf_maze_device>;
+const device_type CHANF_ROM_HANGMAN = device_creator<chanf_hangman_device>;
+const device_type CHANF_ROM_CHESS = device_creator<chanf_chess_device>;
+const device_type CHANF_ROM_MULTI_OLD = device_creator<chanf_multi_old_device>;
+const device_type CHANF_ROM_MULTI_FINAL = device_creator<chanf_multi_final_device>;
chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp
index b2014db586e..a0be37a2fa5 100644
--- a/src/devices/bus/chanf/slot.cpp
+++ b/src/devices/bus/chanf/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type CHANF_CART_SLOT = &device_creator<channelf_cart_slot_device>;
+const device_type CHANF_CART_SLOT = device_creator<channelf_cart_slot_device>;
//**************************************************************************
// Channel F cartridges Interface
diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp
index e6b005756bf..8973a36ccf6 100644
--- a/src/devices/bus/coco/coco_232.cpp
+++ b/src/devices/bus/coco/coco_232.cpp
@@ -31,7 +31,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_232 = &device_creator<coco_232_device>;
+const device_type COCO_232 = device_creator<coco_232_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp
index 1d5322e1801..91fa892e950 100644
--- a/src/devices/bus/coco/coco_dwsock.cpp
+++ b/src/devices/bus/coco/coco_dwsock.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COCO_DWSOCK = &device_creator<beckerport_device>;
+const device_type COCO_DWSOCK = device_creator<beckerport_device>;
//-------------------------------------------------
// INPUT_PORTS( coco_drivewire )
diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
index eca128aa9c4..42978c56593 100644
--- a/src/devices/bus/coco/coco_dwsock.h
+++ b/src/devices/bus/coco/coco_dwsock.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Nathan Woods
-#ifndef _DWSOCK_H_
-#define _DWSOCK_H_
+#ifndef MAME_DEVICES_BUS_COCO_DWSOCKH_H
+#define MAME_DEVICES_BUS_COCO_DWSOCKH_H
#include "osdcore.h"
@@ -67,6 +67,6 @@ private:
extern const device_type COCO_DWSOCK;
// device iterator
-typedef device_type_iterator<&device_creator<beckerport_device>, beckerport_device> beckerport_device_iterator;
+typedef device_type_iterator<COCO_DWSOCK, beckerport_device> beckerport_device_iterator;
-#endif /* _DWSOCK_H_ */
+#endif // MAME_DEVICES_BUS_COCO_DWSOCKH_H
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 8846f386aef..1af110cacb2 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -428,7 +428,7 @@ namespace
};
}
-const device_type COCO_FDC = &device_creator<coco_fdc_device>;
+const device_type COCO_FDC = device_creator<coco_fdc_device>;
//**************************************************************************
@@ -463,7 +463,7 @@ namespace
};
};
-const device_type COCO_FDC_V11 = &device_creator<coco_fdc_v11_device>;
+const device_type COCO_FDC_V11 = device_creator<coco_fdc_v11_device>;
//**************************************************************************
@@ -498,7 +498,7 @@ namespace
};
};
-const device_type COCO3_HDB1 = &device_creator<coco3_hdb1_device>;
+const device_type COCO3_HDB1 = device_creator<coco3_hdb1_device>;
//**************************************************************************
// CP400 FDC
@@ -529,4 +529,4 @@ namespace
};
};
-const device_type CP400_FDC = &device_creator<cp400_fdc_device>;
+const device_type CP400_FDC = device_creator<cp400_fdc_device>;
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index dcfe5f062aa..70b663f3c6e 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -125,7 +125,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>;
+const device_type COCO_MULTIPAK = device_creator<coco_multipak_device>;
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index 50503d592fa..1d3ee1c5a94 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -14,7 +14,10 @@
#include "emu.h"
#include "coco_orch90.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
static MACHINE_CONFIG_FRAGMENT(coco_orch90)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -29,7 +32,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>;
+const device_type COCO_ORCH90 = device_creator<coco_orch90_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp
index e3ba87bbbdb..873be31ca00 100644
--- a/src/devices/bus/coco/coco_pak.cpp
+++ b/src/devices/bus/coco/coco_pak.cpp
@@ -43,7 +43,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_PAK = &device_creator<coco_pak_device>;
+const device_type COCO_PAK = device_creator<coco_pak_device>;
//**************************************************************************
// LIVE DEVICE
@@ -138,7 +138,7 @@ uint8_t* coco_pak_device::get_cart_base()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_PAK_BANKED = &device_creator<coco_pak_banked_device>;
+const device_type COCO_PAK_BANKED = device_creator<coco_pak_banked_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 1d5c3b3fa2f..bb3c0e0b7ba 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -124,7 +124,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCO_T4426 = &device_creator<coco_t4426_device>;
+const device_type COCO_T4426 = device_creator<coco_t4426_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp
index d9c9db3aaee..9edc472b9bd 100644
--- a/src/devices/bus/coco/cococart.cpp
+++ b/src/devices/bus/coco/cococart.cpp
@@ -23,7 +23,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type COCOCART_SLOT = &device_creator<cococart_slot_device>;
+const device_type COCOCART_SLOT = device_creator<cococart_slot_device>;
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index f633d465f8c..b3b4c272e4e 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -297,7 +297,7 @@ namespace
};
};
-const device_type DRAGON_FDC = &device_creator<dragon_fdc_device>;
+const device_type DRAGON_FDC = device_creator<dragon_fdc_device>;
//**************************************************************************
@@ -329,4 +329,4 @@ namespace
};
};
-const device_type SDTANDY_FDC = &device_creator<sdtandy_fdc_device>;
+const device_type SDTANDY_FDC = device_creator<sdtandy_fdc_device>;
diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp
index f5df1198d57..6553f56b19a 100644
--- a/src/devices/bus/coleco/ctrl.cpp
+++ b/src/devices/bus/coleco/ctrl.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITION
//**************************************************************************
-const device_type COLECOVISION_CONTROL_PORT = &device_creator<colecovision_control_port_device>;
+const device_type COLECOVISION_CONTROL_PORT = device_creator<colecovision_control_port_device>;
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp
index c70a4dabde1..4e5cc012456 100644
--- a/src/devices/bus/coleco/exp.cpp
+++ b/src/devices/bus/coleco/exp.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COLECOVISION_CARTRIDGE_SLOT = &device_creator<colecovision_cartridge_slot_device>;
+const device_type COLECOVISION_CARTRIDGE_SLOT = device_creator<colecovision_cartridge_slot_device>;
diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp
index aa08ab18735..9e9f7610dd4 100644
--- a/src/devices/bus/coleco/hand.cpp
+++ b/src/devices/bus/coleco/hand.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COLECO_HAND_CONTROLLER = &device_creator<coleco_hand_controller_t>;
+const device_type COLECO_HAND_CONTROLLER = device_creator<coleco_hand_controller_t>;
CUSTOM_INPUT_MEMBER( coleco_hand_controller_t::keypad_r )
diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp
index 2c1725fd507..28835f7ad85 100644
--- a/src/devices/bus/coleco/sac.cpp
+++ b/src/devices/bus/coleco/sac.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COLECO_SUPER_ACTION_CONTROLLER = &device_creator<coleco_super_action_controller_t>;
+const device_type COLECO_SUPER_ACTION_CONTROLLER = device_creator<coleco_super_action_controller_t>;
CUSTOM_INPUT_MEMBER( coleco_super_action_controller_t::keypad_r )
diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp
index e588a71f2ee..d6ba16eafa5 100644
--- a/src/devices/bus/coleco/std.cpp
+++ b/src/devices/bus/coleco/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COLECOVISION_STANDARD = &device_creator<colecovision_standard_cartridge_device>;
+const device_type COLECOVISION_STANDARD = device_creator<colecovision_standard_cartridge_device>;
diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp
index 62000ebd5a1..d7de9dde30c 100644
--- a/src/devices/bus/coleco/xin1.cpp
+++ b/src/devices/bus/coleco/xin1.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COLECOVISION_XIN1 = &device_creator<colecovision_xin1_cartridge_device>;
+const device_type COLECOVISION_XIN1 = device_creator<colecovision_xin1_cartridge_device>;
diff --git a/src/devices/bus/compis/graphics.cpp b/src/devices/bus/compis/graphics.cpp
index 1c02e77e005..7a52e547b35 100644
--- a/src/devices/bus/compis/graphics.cpp
+++ b/src/devices/bus/compis/graphics.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMPIS_GRAPHICS_SLOT = &device_creator<compis_graphics_slot_t>;
+const device_type COMPIS_GRAPHICS_SLOT = device_creator<compis_graphics_slot_t>;
diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp
index 68afe3b0341..052f2d5ee98 100644
--- a/src/devices/bus/compis/hrg.cpp
+++ b/src/devices/bus/compis/hrg.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "hrg.h"
+#include "screen.h"
//**************************************************************************
@@ -23,8 +24,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMPIS_HRG = &device_creator<compis_hrg_t>;
-const device_type COMPIS_UHRG = &device_creator<compis_uhrg_t>;
+const device_type COMPIS_HRG = device_creator<compis_hrg_t>;
+const device_type COMPIS_UHRG = device_creator<compis_uhrg_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp
index bd59a7b1027..7c7fa88472b 100644
--- a/src/devices/bus/compucolor/floppy.cpp
+++ b/src/devices/bus/compucolor/floppy.cpp
@@ -15,8 +15,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMPUCOLOR_FLOPPY_PORT = &device_creator<compucolor_floppy_port_device>;
-const device_type COMPUCOLOR_FLOPPY = &device_creator<compucolor_floppy_device>;
+const device_type COMPUCOLOR_FLOPPY_PORT = device_creator<compucolor_floppy_port_device>;
+const device_type COMPUCOLOR_FLOPPY = device_creator<compucolor_floppy_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 47e4f9bc93f..65a0b3fd9c9 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -46,6 +46,7 @@ Notes:
#include "emu.h"
#include "clm.h"
+#include "screen.h"
@@ -63,7 +64,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_CLM = &device_creator<comx_clm_device>;
+const device_type COMX_CLM = device_creator<comx_clm_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp
index 9bd790e620e..701a78a9f8b 100644
--- a/src/devices/bus/comx35/eprom.cpp
+++ b/src/devices/bus/comx35/eprom.cpp
@@ -21,7 +21,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_EPR = &device_creator<comx_epr_device>;
+const device_type COMX_EPR = device_creator<comx_epr_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index 1be1d2074e3..8e2aacf910e 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_EXPANSION_SLOT = &device_creator<comx_expansion_slot_device>;
+const device_type COMX_EXPANSION_SLOT = device_creator<comx_expansion_slot_device>;
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index 0ee42ff79db..51962fb2d39 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -66,7 +66,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_EB = &device_creator<comx_eb_device>;
+const device_type COMX_EB = device_creator<comx_eb_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index 93f2b8452ef..8550fe414ec 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -58,7 +58,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_FD = &device_creator<comx_fd_device>;
+const device_type COMX_FD = device_creator<comx_fd_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp
index 48bfe63ecfc..3a7a7b9b311 100644
--- a/src/devices/bus/comx35/joycard.cpp
+++ b/src/devices/bus/comx35/joycard.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_JOY = &device_creator<comx_joy_device>;
+const device_type COMX_JOY = device_creator<comx_joy_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index 0aeb8adb7b4..1a24c93cae6 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_PRN = &device_creator<comx_prn_device>;
+const device_type COMX_PRN = device_creator<comx_prn_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp
index 2b6ab934237..89c7bfff728 100644
--- a/src/devices/bus/comx35/ram.cpp
+++ b/src/devices/bus/comx35/ram.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_RAM = &device_creator<comx_ram_device>;
+const device_type COMX_RAM = device_creator<comx_ram_device>;
//**************************************************************************
diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp
index a44a38bae96..d08aac2175e 100644
--- a/src/devices/bus/comx35/thermal.cpp
+++ b/src/devices/bus/comx35/thermal.cpp
@@ -21,7 +21,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMX_THM = &device_creator<comx_thm_device>;
+const device_type COMX_THM = device_creator<comx_thm_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index 18eea564be0..8cc82aea1cb 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -8,14 +8,16 @@
#include "emu.h"
#include "amdrum.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_AMDRUM = &device_creator<cpc_amdrum_device>;
+const device_type CPC_AMDRUM = device_creator<cpc_amdrum_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_amdrum )
diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp
index 45d90ccc96e..1118e0c8b61 100644
--- a/src/devices/bus/cpc/brunword4.cpp
+++ b/src/devices/bus/cpc/brunword4.cpp
@@ -14,7 +14,7 @@
#include "emu.h"
#include "brunword4.h"
-const device_type CPC_BRUNWORD_MK4 = &device_creator<cpc_brunword4_device>;
+const device_type CPC_BRUNWORD_MK4 = device_creator<cpc_brunword4_device>;
ROM_START( cpc_brunword4 )
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index 0708cb67f9a..b9ab288ec9a 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_PDS = &device_creator<cpc_pds_device>;
+const device_type CPC_PDS = device_creator<cpc_pds_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_pds )
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index aae1044dc26..3fa2848aa8c 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "cpc_rom.h"
-const device_type CPC_ROM = &device_creator<cpc_rom_device>;
+const device_type CPC_ROM = device_creator<cpc_rom_device>;
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
@@ -73,7 +73,7 @@ void cpc_rom_device::device_reset()
/*** ROM image device ***/
// device type definition
-const device_type ROMSLOT = &device_creator<rom_image_device>;
+const device_type ROMSLOT = device_creator<rom_image_device>;
//-------------------------------------------------
// rom_image_device - constructor
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index 585a87375ff..fee168423f0 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -15,8 +15,8 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_RS232 = &device_creator<cpc_rs232_device>;
-const device_type CPC_RS232_AMS = &device_creator<cpc_ams_rs232_device>;
+const device_type CPC_RS232 = device_creator<cpc_rs232_device>;
+const device_type CPC_RS232_AMS = device_creator<cpc_ams_rs232_device>;
// device machine config
static MACHINE_CONFIG_FRAGMENT( cpc_rs232 )
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index ef21af1e384..af2627e03bb 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -10,14 +10,17 @@
#include "emu.h"
#include "cpc_ssa1.h"
+#include "speaker.h"
+
+
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_SSA1 = &device_creator<cpc_ssa1_device>;
-const device_type CPC_DKSPEECH = &device_creator<cpc_dkspeech_device>;
+const device_type CPC_SSA1 = device_creator<cpc_ssa1_device>;
+const device_type CPC_DKSPEECH = device_creator<cpc_dkspeech_device>;
//-------------------------------------------------
// device I/O handlers
diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp
index 2e4f0c558a3..ff1db3d6741 100644
--- a/src/devices/bus/cpc/cpcexp.cpp
+++ b/src/devices/bus/cpc/cpcexp.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type CPC_EXPANSION_SLOT = &device_creator<cpc_expansion_slot_device>;
+const device_type CPC_EXPANSION_SLOT = device_creator<cpc_expansion_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index be82f2f05b8..b78caa06129 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -13,7 +13,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_DDI1 = &device_creator<cpc_ddi1_device>;
+const device_type CPC_DDI1 = device_creator<cpc_ddi1_device>;
static SLOT_INTERFACE_START( ddi1_floppies )
SLOT_INTERFACE( "3ssdd", FLOPPY_3_SSDD )
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index 6a48a653016..5a26931e400 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_DOUBLER = &device_creator<cpc_doubler_device>;
+const device_type CPC_DOUBLER = device_creator<cpc_doubler_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_doubler )
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index 370b3076b8c..427ef00efd4 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_HD20 = &device_creator<cpc_hd20_device>;
+const device_type CPC_HD20 = device_creator<cpc_hd20_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_hd20 )
MCFG_DEVICE_ADD("hdc",ST11M_HDC,0)
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index d2bf11d2009..6736f2367dd 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -10,13 +10,16 @@
#include "emu.h"
#include "magicsound.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
+
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type AL_MAGICSOUND = &device_creator<al_magicsound_device>;
+const device_type AL_MAGICSOUND = device_creator<al_magicsound_device>;
static MACHINE_CONFIG_FRAGMENT( al_magicsound )
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index 90d08716e25..b67b4682649 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_MFACE2 = &device_creator<cpc_multiface2_device>;
+const device_type CPC_MFACE2 = device_creator<cpc_multiface2_device>;
// device machine config
static MACHINE_CONFIG_FRAGMENT( cpc_mface2 )
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 6e4a7660527..de8da2d8377 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -12,13 +12,16 @@
#include "emu.h"
#include "playcity.h"
+#include "speaker.h"
+
+
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_PLAYCITY = &device_creator<cpc_playcity_device>;
+const device_type CPC_PLAYCITY = device_creator<cpc_playcity_device>;
// device machine config
static MACHINE_CONFIG_FRAGMENT( cpc_playcity )
diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp
index b6a453d79cd..89805cd607b 100644
--- a/src/devices/bus/cpc/smartwatch.cpp
+++ b/src/devices/bus/cpc/smartwatch.cpp
@@ -17,7 +17,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_SMARTWATCH = &device_creator<cpc_smartwatch_device>;
+const device_type CPC_SMARTWATCH = device_creator<cpc_smartwatch_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_smartwatch )
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index 524d1ad228c..049e5f487f2 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -21,7 +21,7 @@
#include "symbfac2.h"
-const device_type CPC_SYMBIFACE2 = &device_creator<cpc_symbiface2_device>;
+const device_type CPC_SYMBIFACE2 = device_creator<cpc_symbiface2_device>;
//**************************************************************************
// DEVICE CONFIG INTERFACE
diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp
index 2dbfcbb5dea..231333dd0e6 100644
--- a/src/devices/bus/cpc/transtape.cpp
+++ b/src/devices/bus/cpc/transtape.cpp
@@ -16,7 +16,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CPC_TRANSTAPE = &device_creator<cpc_transtape_device>;
+const device_type CPC_TRANSTAPE = device_creator<cpc_transtape_device>;
ROM_START( cpc_transtape )
ROM_REGION( 0x4000, "tt_rom", 0 )
diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp
index 0f54308df9c..773eb00472b 100644
--- a/src/devices/bus/crvision/rom.cpp
+++ b/src/devices/bus/crvision/rom.cpp
@@ -17,13 +17,13 @@
// crvision_rom_device - constructor
//-------------------------------------------------
-const device_type CRVISION_ROM_4K = &device_creator<crvision_rom_device>;
-const device_type CRVISION_ROM_6K = &device_creator<crvision_rom6k_device>;
-const device_type CRVISION_ROM_8K = &device_creator<crvision_rom8k_device>;
-const device_type CRVISION_ROM_10K = &device_creator<crvision_rom10k_device>;
-const device_type CRVISION_ROM_12K = &device_creator<crvision_rom12k_device>;
-const device_type CRVISION_ROM_16K = &device_creator<crvision_rom16k_device>;
-const device_type CRVISION_ROM_18K = &device_creator<crvision_rom18k_device>;
+const device_type CRVISION_ROM_4K = device_creator<crvision_rom_device>;
+const device_type CRVISION_ROM_6K = device_creator<crvision_rom6k_device>;
+const device_type CRVISION_ROM_8K = device_creator<crvision_rom8k_device>;
+const device_type CRVISION_ROM_10K = device_creator<crvision_rom10k_device>;
+const device_type CRVISION_ROM_12K = device_creator<crvision_rom12k_device>;
+const device_type CRVISION_ROM_16K = device_creator<crvision_rom16k_device>;
+const device_type CRVISION_ROM_18K = device_creator<crvision_rom18k_device>;
crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp
index 4a435aa729f..0cd05162add 100644
--- a/src/devices/bus/crvision/slot.cpp
+++ b/src/devices/bus/crvision/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type CRVISION_CART_SLOT = &device_creator<crvision_cart_slot_device>;
+const device_type CRVISION_CART_SLOT = device_creator<crvision_cart_slot_device>;
//**************************************************************************
// CreatiVision Cartridges Interface
diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp
index 121eeafaafa..379be49cef2 100644
--- a/src/devices/bus/dmv/dmvbus.cpp
+++ b/src/devices/bus/dmv/dmvbus.cpp
@@ -162,7 +162,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMVCART_SLOT = &device_creator<dmvcart_slot_device>;
+const device_type DMVCART_SLOT = device_creator<dmvcart_slot_device>;
//**************************************************************************
// DMV cartridge interface
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 00cb4004f51..cb3c67a5f4e 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -41,7 +41,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K210 = &device_creator<dmv_k210_device>;
+const device_type DMV_K210 = device_creator<dmv_k210_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index f6ec770df19..9f5ad2dd154 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -122,7 +122,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K220 = &device_creator<dmv_k220_device>;
+const device_type DMV_K220 = device_creator<dmv_k220_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index f3e04adf0fe..4aad694c433 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -93,10 +93,10 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K230 = &device_creator<dmv_k230_device>;
-const device_type DMV_K231 = &device_creator<dmv_k231_device>;
-const device_type DMV_K234 = &device_creator<dmv_k234_device>;
-const device_type DMV_K235 = &device_creator<dmv_k235_device>;
+const device_type DMV_K230 = device_creator<dmv_k230_device>;
+const device_type DMV_K231 = device_creator<dmv_k231_device>;
+const device_type DMV_K234 = device_creator<dmv_k234_device>;
+const device_type DMV_K235 = device_creator<dmv_k235_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp
index 11e31431e9b..129823975a7 100644
--- a/src/devices/bus/dmv/k233.cpp
+++ b/src/devices/bus/dmv/k233.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K233 = &device_creator<dmv_k233_device>;
+const device_type DMV_K233 = device_creator<dmv_k233_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index 211c678392b..c466e83e121 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -98,10 +98,10 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K801 = &device_creator<dmv_k801_device>;
-const device_type DMV_K211 = &device_creator<dmv_k211_device>;
-const device_type DMV_K212 = &device_creator<dmv_k212_device>;
-const device_type DMV_K213 = &device_creator<dmv_k213_device>;
+const device_type DMV_K801 = device_creator<dmv_k801_device>;
+const device_type DMV_K211 = device_creator<dmv_k211_device>;
+const device_type DMV_K212 = device_creator<dmv_k212_device>;
+const device_type DMV_K213 = device_creator<dmv_k213_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index b57e01c3b19..be80480bac6 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -38,7 +38,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K803 = &device_creator<dmv_k803_device>;
+const device_type DMV_K803 = device_creator<dmv_k803_device>;
//**************************************************************************
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 6667d267899..748080b41f9 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -65,7 +65,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K806 = &device_creator<dmv_k806_device>;
+const device_type DMV_K806 = device_creator<dmv_k806_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp
index 1f2d5e2df2a..b676a7c3148 100644
--- a/src/devices/bus/dmv/ram.cpp
+++ b/src/devices/bus/dmv/ram.cpp
@@ -20,9 +20,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DMV_K200 = &device_creator<dmv_k200_device>;
-const device_type DMV_K202 = &device_creator<dmv_k202_device>;
-const device_type DMV_K208 = &device_creator<dmv_k208_device>;
+const device_type DMV_K200 = device_creator<dmv_k200_device>;
+const device_type DMV_K202 = device_creator<dmv_k202_device>;
+const device_type DMV_K208 = device_creator<dmv_k208_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index d9a5844a6c5..0947322dfc7 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>;
+const device_type ECBBUS_SLOT = device_creator<ecbbus_slot_device>;
@@ -63,7 +63,7 @@ void ecbbus_slot_device::device_start()
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ECBBUS = &device_creator<ecbbus_device>;
+const device_type ECBBUS = device_creator<ecbbus_device>;
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index c4da34f0e81..3dea8a6b486 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -9,6 +9,9 @@
#include "emu.h"
#include "grip.h"
+#include "screen.h"
+#include "speaker.h"
+
//**************************************************************************
@@ -32,7 +35,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ECB_GRIP21 = &device_creator<grip_device>;
+const device_type ECB_GRIP21 = device_creator<grip_device>;
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index c2aef7cda8b..0dc2d86bf8b 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -6,19 +6,20 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_ECBBUS_GRIP_H
+#define MAME_BUS_ECBBUS_GRIP_H
-#ifndef __GRIP__
-#define __GRIP__
+#pragma once
#include "ecbbus.h"
+
+#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "bus/centronics/ctronics.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
#include "machine/z80sti.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "video/mc6845.h"
@@ -110,7 +111,6 @@ private:
// timers
emu_timer *m_kb_timer;
-};
/*
@@ -122,9 +122,10 @@ private:
int m_dpage; // displayed video page
*/
+};
// device type definition
extern const device_type ECB_GRIP21;
-#endif
+#endif // MAME_BUS_ECBBUS_GRIP_H
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 3ef261e174a..80fc8bb3029 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -75,8 +75,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type E01 = &device_creator<e01_device>;
-const device_type E01S = &device_creator<e01s_device>;
+const device_type E01 = device_creator<e01_device>;
+const device_type E01S = device_creator<e01s_device>;
e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
:e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; }
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index 56d1461124f..18e5134f459 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -26,8 +26,8 @@ static const char *const SIGNAL_NAME[] = { "CLK", "DATA" };
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ECONET = &device_creator<econet_device>;
-const device_type ECONET_SLOT = &device_creator<econet_slot_device>;
+const device_type ECONET = device_creator<econet_device>;
+const device_type ECONET_SLOT = device_creator<econet_slot_device>;
diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp
index 59df7604656..dad23b527e0 100644
--- a/src/devices/bus/electron/exp.cpp
+++ b/src/devices/bus/electron/exp.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ELECTRON_EXPANSION_SLOT = &device_creator<electron_expansion_slot_device>;
+const device_type ELECTRON_EXPANSION_SLOT = device_creator<electron_expansion_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index bef3596db51..ba437842a4c 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -9,13 +9,14 @@
#include "emu.h"
#include "m2105.h"
+#include "speaker.h"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ELECTRON_M2105 = &device_creator<electron_m2105_device>;
+const device_type ELECTRON_M2105 = device_creator<electron_m2105_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp
index ae56dbe98f3..98189b6cae7 100644
--- a/src/devices/bus/electron/plus3.cpp
+++ b/src/devices/bus/electron/plus3.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ELECTRON_PLUS3 = &device_creator<electron_plus3_device>;
+const device_type ELECTRON_PLUS3 = device_creator<electron_plus3_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index 2fceed2bece..9b8d6ea9d48 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -62,7 +62,7 @@ This PCB plugs into the external expansion connector on the right side of the ma
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EP64_EXDOS = &device_creator<ep64_exdos_device>;
+const device_type EP64_EXDOS = device_creator<ep64_exdos_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp
index 8179015100d..028b397b6df 100644
--- a/src/devices/bus/ep64/exp.cpp
+++ b/src/devices/bus/ep64/exp.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EP64_EXPANSION_BUS_SLOT = &device_creator<ep64_expansion_bus_slot_device>;
+const device_type EP64_EXPANSION_BUS_SLOT = device_creator<ep64_expansion_bus_slot_device>;
diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp
index c77ba243810..6fd316989dc 100644
--- a/src/devices/bus/epson_sio/epson_sio.cpp
+++ b/src/devices/bus/epson_sio/epson_sio.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type EPSON_SIO = &device_creator<epson_sio_device>;
+const device_type EPSON_SIO = device_creator<epson_sio_device>;
//**************************************************************************
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 3dbe9de76c9..0e3bac64c1a 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -18,7 +18,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EPSON_PF10 = &device_creator<epson_pf10_device>;
+const device_type EPSON_PF10 = device_creator<epson_pf10_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index 066c11af870..f1af2da2c74 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EPSON_TF20 = &device_creator<epson_tf20_device>;
+const device_type EPSON_TF20 = device_creator<epson_tf20_device>;
//-------------------------------------------------
// address maps
diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp
index 3b6c30949c2..6229965a151 100644
--- a/src/devices/bus/gameboy/gb_slot.cpp
+++ b/src/devices/bus/gameboy/gb_slot.cpp
@@ -25,8 +25,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type GB_CART_SLOT = &device_creator<gb_cart_slot_device>;
-const device_type MEGADUCK_CART_SLOT = &device_creator<megaduck_cart_slot_device>;
+const device_type GB_CART_SLOT = device_creator<gb_cart_slot_device>;
+const device_type MEGADUCK_CART_SLOT = device_creator<megaduck_cart_slot_device>;
//**************************************************************************
// GB cartridges Interface
diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp
index 6d131f7aea2..6aba03a2124 100644
--- a/src/devices/bus/gameboy/mbc.cpp
+++ b/src/devices/bus/gameboy/mbc.cpp
@@ -18,23 +18,23 @@
// gb_rom_mbc*_device - constructor
//-------------------------------------------------
-const device_type GB_ROM_MBC1 = &device_creator<gb_rom_mbc1_device>;
-const device_type GB_ROM_MBC2 = &device_creator<gb_rom_mbc2_device>;
-const device_type GB_ROM_MBC3 = &device_creator<gb_rom_mbc3_device>;
-const device_type GB_ROM_MBC5 = &device_creator<gb_rom_mbc5_device>;
-const device_type GB_ROM_MBC6 = &device_creator<gb_rom_mbc6_device>;
-const device_type GB_ROM_MBC7 = &device_creator<gb_rom_mbc7_device>;
-const device_type GB_ROM_M161 = &device_creator<gb_rom_m161_device>;
-const device_type GB_ROM_MMM01 = &device_creator<gb_rom_mmm01_device>;
-const device_type GB_ROM_SACHEN1 = &device_creator<gb_rom_sachen_mmc1_device>;
-const device_type GB_ROM_SACHEN2 = &device_creator<gb_rom_sachen_mmc2_device>;
-const device_type GB_ROM_188IN1 = &device_creator<gb_rom_188in1_device>;
-const device_type GB_ROM_SINTAX = &device_creator<gb_rom_sintax_device>;
-const device_type GB_ROM_CHONGWU = &device_creator<gb_rom_chongwu_device>;
-const device_type GB_ROM_LICHENG = &device_creator<gb_rom_licheng_device>;
-const device_type GB_ROM_DIGIMON = &device_creator<gb_rom_digimon_device>;
-const device_type GB_ROM_ROCKMAN8 = &device_creator<gb_rom_rockman8_device>;
-const device_type GB_ROM_SM3SP = &device_creator<gb_rom_sm3sp_device>;
+const device_type GB_ROM_MBC1 = device_creator<gb_rom_mbc1_device>;
+const device_type GB_ROM_MBC2 = device_creator<gb_rom_mbc2_device>;
+const device_type GB_ROM_MBC3 = device_creator<gb_rom_mbc3_device>;
+const device_type GB_ROM_MBC5 = device_creator<gb_rom_mbc5_device>;
+const device_type GB_ROM_MBC6 = device_creator<gb_rom_mbc6_device>;
+const device_type GB_ROM_MBC7 = device_creator<gb_rom_mbc7_device>;
+const device_type GB_ROM_M161 = device_creator<gb_rom_m161_device>;
+const device_type GB_ROM_MMM01 = device_creator<gb_rom_mmm01_device>;
+const device_type GB_ROM_SACHEN1 = device_creator<gb_rom_sachen_mmc1_device>;
+const device_type GB_ROM_SACHEN2 = device_creator<gb_rom_sachen_mmc2_device>;
+const device_type GB_ROM_188IN1 = device_creator<gb_rom_188in1_device>;
+const device_type GB_ROM_SINTAX = device_creator<gb_rom_sintax_device>;
+const device_type GB_ROM_CHONGWU = device_creator<gb_rom_chongwu_device>;
+const device_type GB_ROM_LICHENG = device_creator<gb_rom_licheng_device>;
+const device_type GB_ROM_DIGIMON = device_creator<gb_rom_digimon_device>;
+const device_type GB_ROM_ROCKMAN8 = device_creator<gb_rom_rockman8_device>;
+const device_type GB_ROM_SM3SP = device_creator<gb_rom_sm3sp_device>;
gb_rom_mbc_device::gb_rom_mbc_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)
diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp
index 609f30b8e52..f06164426ef 100644
--- a/src/devices/bus/gameboy/rom.cpp
+++ b/src/devices/bus/gameboy/rom.cpp
@@ -19,14 +19,14 @@
// gb_rom_device - constructor
//-------------------------------------------------
-const device_type GB_STD_ROM = &device_creator<gb_rom_device>;
-const device_type GB_ROM_TAMA5 = &device_creator<gb_rom_tama5_device>;
-const device_type GB_ROM_WISDOM = &device_creator<gb_rom_wisdom_device>;
-const device_type GB_ROM_YONG = &device_creator<gb_rom_yong_device>;
-const device_type GB_ROM_ATVRAC = &device_creator<gb_rom_atvrac_device>;
-const device_type GB_ROM_LASAMA = &device_creator<gb_rom_lasama_device>;
-
-const device_type MEGADUCK_ROM = &device_creator<megaduck_rom_device>;
+const device_type GB_STD_ROM = device_creator<gb_rom_device>;
+const device_type GB_ROM_TAMA5 = device_creator<gb_rom_tama5_device>;
+const device_type GB_ROM_WISDOM = device_creator<gb_rom_wisdom_device>;
+const device_type GB_ROM_YONG = device_creator<gb_rom_yong_device>;
+const device_type GB_ROM_ATVRAC = device_creator<gb_rom_atvrac_device>;
+const device_type GB_ROM_LASAMA = device_creator<gb_rom_lasama_device>;
+
+const device_type MEGADUCK_ROM = device_creator<megaduck_rom_device>;
gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp
index ff45b646acb..3be7f8a1080 100644
--- a/src/devices/bus/gamegear/ggext.cpp
+++ b/src/devices/bus/gamegear/ggext.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type GG_EXT_PORT = &device_creator<gg_ext_port_device>;
+const device_type GG_EXT_PORT = device_creator<gg_ext_port_device>;
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index a6212395d34..e829dd80e5e 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_CTRL_ADAPTOR = &device_creator<sms_ctrl_adaptor_device>;
+const device_type SMS_CTRL_ADAPTOR = device_creator<sms_ctrl_adaptor_device>;
//**************************************************************************
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index bb9f5b5f992..61dd7cda417 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type GBA_CART_SLOT = &device_creator<gba_cart_slot_device>;
+const device_type GBA_CART_SLOT = device_creator<gba_cart_slot_device>;
//**************************************************************************
// GBA cartridges Interface
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 7080a60dc01..78875860300 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -21,19 +21,19 @@
// gba_rom_device - constructor
//-------------------------------------------------
-const device_type GBA_ROM_STD = &device_creator<gba_rom_device>;
-const device_type GBA_ROM_SRAM = &device_creator<gba_rom_sram_device>;
-const device_type GBA_ROM_DRILLDOZ = &device_creator<gba_rom_drilldoz_device>;
-const device_type GBA_ROM_WARIOTWS = &device_creator<gba_rom_wariotws_device>;
-const device_type GBA_ROM_EEPROM = &device_creator<gba_rom_eeprom_device>;
-const device_type GBA_ROM_YOSHIUG = &device_creator<gba_rom_yoshiug_device>;
-const device_type GBA_ROM_EEPROM64 = &device_creator<gba_rom_eeprom64_device>;
-const device_type GBA_ROM_BOKTAI = &device_creator<gba_rom_boktai_device>;
-const device_type GBA_ROM_FLASH = &device_creator<gba_rom_flash_device>;
-const device_type GBA_ROM_FLASH_RTC = &device_creator<gba_rom_flash_rtc_device>;
-const device_type GBA_ROM_FLASH1M = &device_creator<gba_rom_flash1m_device>;
-const device_type GBA_ROM_FLASH1M_RTC = &device_creator<gba_rom_flash1m_rtc_device>;
-const device_type GBA_ROM_3DMATRIX = &device_creator<gba_rom_3dmatrix_device>;
+const device_type GBA_ROM_STD = device_creator<gba_rom_device>;
+const device_type GBA_ROM_SRAM = device_creator<gba_rom_sram_device>;
+const device_type GBA_ROM_DRILLDOZ = device_creator<gba_rom_drilldoz_device>;
+const device_type GBA_ROM_WARIOTWS = device_creator<gba_rom_wariotws_device>;
+const device_type GBA_ROM_EEPROM = device_creator<gba_rom_eeprom_device>;
+const device_type GBA_ROM_YOSHIUG = device_creator<gba_rom_yoshiug_device>;
+const device_type GBA_ROM_EEPROM64 = device_creator<gba_rom_eeprom64_device>;
+const device_type GBA_ROM_BOKTAI = device_creator<gba_rom_boktai_device>;
+const device_type GBA_ROM_FLASH = device_creator<gba_rom_flash_device>;
+const device_type GBA_ROM_FLASH_RTC = device_creator<gba_rom_flash_rtc_device>;
+const device_type GBA_ROM_FLASH1M = device_creator<gba_rom_flash1m_device>;
+const device_type GBA_ROM_FLASH1M_RTC = device_creator<gba_rom_flash1m_rtc_device>;
+const device_type GBA_ROM_3DMATRIX = device_creator<gba_rom_3dmatrix_device>;
gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp
index a27e0ddafcd..15db67732cc 100644
--- a/src/devices/bus/generic/ram.cpp
+++ b/src/devices/bus/generic/ram.cpp
@@ -26,12 +26,12 @@
// constructor
//-------------------------------------------------
-const device_type GENERIC_RAM_32K_PLAIN = &device_creator<generic_ram_32k_plain_device>;
-const device_type GENERIC_RAM_64K_PLAIN = &device_creator<generic_ram_64k_plain_device>;
-const device_type GENERIC_RAM_128K_PLAIN = &device_creator<generic_ram_128k_plain_device>;
-const device_type GENERIC_RAM_32K_LINEAR = &device_creator<generic_ram_32k_linear_device>;
-const device_type GENERIC_RAM_64K_LINEAR = &device_creator<generic_ram_64k_linear_device>;
-const device_type GENERIC_RAM_128K_LINEAR = &device_creator<generic_ram_128k_linear_device>;
+const device_type GENERIC_RAM_32K_PLAIN = device_creator<generic_ram_32k_plain_device>;
+const device_type GENERIC_RAM_64K_PLAIN = device_creator<generic_ram_64k_plain_device>;
+const device_type GENERIC_RAM_128K_PLAIN = device_creator<generic_ram_128k_plain_device>;
+const device_type GENERIC_RAM_32K_LINEAR = device_creator<generic_ram_32k_linear_device>;
+const device_type GENERIC_RAM_64K_LINEAR = device_creator<generic_ram_64k_linear_device>;
+const device_type GENERIC_RAM_128K_LINEAR = device_creator<generic_ram_128k_linear_device>;
generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source)
diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp
index 41a35c8be2b..9a965cc2ccb 100644
--- a/src/devices/bus/generic/rom.cpp
+++ b/src/devices/bus/generic/rom.cpp
@@ -26,9 +26,9 @@
// constructor
//-------------------------------------------------
-const device_type GENERIC_ROM_PLAIN = &device_creator<generic_rom_plain_device>;
-const device_type GENERIC_ROM_LINEAR = &device_creator<generic_rom_linear_device>;
-const device_type GENERIC_ROMRAM_PLAIN = &device_creator<generic_romram_plain_device>;
+const device_type GENERIC_ROM_PLAIN = device_creator<generic_rom_plain_device>;
+const device_type GENERIC_ROM_LINEAR = device_creator<generic_rom_linear_device>;
+const device_type GENERIC_ROMRAM_PLAIN = device_creator<generic_romram_plain_device>;
generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp
index d081ceb5fed..442c09de3f1 100644
--- a/src/devices/bus/generic/slot.cpp
+++ b/src/devices/bus/generic/slot.cpp
@@ -28,7 +28,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type GENERIC_SOCKET = &device_creator<generic_slot_device>;
+const device_type GENERIC_SOCKET = device_creator<generic_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index 74da49aebca..d1a93b30fcb 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -380,4 +380,4 @@ machine_config_constructor hp98034_io_card::device_mconfig_additions() const
}
// device type definition
-const device_type HP98034_IO_CARD = &device_creator<hp98034_io_card>;
+const device_type HP98034_IO_CARD = device_creator<hp98034_io_card>;
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 459641cf7a3..bea33e32cf0 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -768,4 +768,4 @@ machine_config_constructor hp98035_io_card::device_mconfig_additions() const
}
// device type definition
-const device_type HP98035_IO_CARD = &device_creator<hp98035_io_card>;
+const device_type HP98035_IO_CARD = device_creator<hp98035_io_card>;
diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp
index 16cdaa641d3..86e948cb5d3 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.cpp
+++ b/src/devices/bus/hp9845_io/hp9845_io.cpp
@@ -13,7 +13,7 @@
#include "includes/hp9845.h"
// device type definition
-const device_type HP9845_IO_SLOT = &device_creator<hp9845_io_slot_device>;
+const device_type HP9845_IO_SLOT = device_creator<hp9845_io_slot_device>;
// +---------------------+
// |hp9845_io_slot_device|
diff --git a/src/devices/bus/hp_optroms/hp_optrom.cpp b/src/devices/bus/hp_optroms/hp_optrom.cpp
index 28eff4114af..49f9f2bc8e6 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.cpp
+++ b/src/devices/bus/hp_optroms/hp_optrom.cpp
@@ -13,8 +13,8 @@
#include "softlist.h"
#include "cpu/hphybrid/hphybrid.h"
-const device_type HP_OPTROM_CART = &device_creator<hp_optrom_cart_device>;
-const device_type HP_OPTROM_SLOT = &device_creator<hp_optrom_slot_device>;
+const device_type HP_OPTROM_CART = device_creator<hp_optrom_cart_device>;
+const device_type HP_OPTROM_SLOT = device_creator<hp_optrom_slot_device>;
// +---------------------+
// |hp_optrom_cart_device|
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 7966c596ac5..b23fb0c02d1 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -33,7 +33,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C2031 = &device_creator<c2031_device>;
+const device_type C2031 = device_creator<c2031_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 23367e51a53..f16ba22261a 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -70,9 +70,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C2040 = &device_creator<c2040_t>;
-const device_type C3040 = &device_creator<c3040_t>;
-const device_type C4040 = &device_creator<c4040_t>;
+const device_type C2040 = device_creator<c2040_t>;
+const device_type C3040 = device_creator<c3040_t>;
+const device_type C4040 = device_creator<c4040_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp
index 1d49dc6aec9..493cdb8ee69 100644
--- a/src/devices/bus/ieee488/c2040fdc.cpp
+++ b/src/devices/bus/ieee488/c2040fdc.cpp
@@ -38,7 +38,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C2040_FDC = &device_creator<c2040_fdc_t>;
+const device_type C2040_FDC = device_creator<c2040_fdc_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index f0709f3046e..11ea6204870 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -54,10 +54,10 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C8050 = &device_creator<c8050_t>;
-const device_type C8250 = &device_creator<c8250_t>;
-const device_type C8250LP = &device_creator<c8250lp_t>;
-const device_type SFD1001 = &device_creator<sfd1001_t>;
+const device_type C8050 = device_creator<c8050_t>;
+const device_type C8250 = device_creator<c8250_t>;
+const device_type C8250LP = device_creator<c8250lp_t>;
+const device_type SFD1001 = device_creator<sfd1001_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp
index 0821d6a1bf7..ae0fe558153 100644
--- a/src/devices/bus/ieee488/c8050fdc.cpp
+++ b/src/devices/bus/ieee488/c8050fdc.cpp
@@ -40,7 +40,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C8050_FDC = &device_creator<c8050_fdc_t>;
+const device_type C8050_FDC = device_creator<c8050_fdc_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index ef1156c8a2c..82fa2e1c4e0 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -36,7 +36,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C8280 = &device_creator<c8280_t>;
+const device_type C8280 = device_creator<c8280_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index f2a0ef398d0..e89dea811eb 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -61,8 +61,8 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type D9060 = &device_creator<d9060_t>;
-const device_type D9090 = &device_creator<d9090_t>;
+const device_type D9060 = device_creator<d9060_t>;
+const device_type D9090 = device_creator<d9090_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 31490a63f3f..5aa56ad92d9 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -58,7 +58,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HARDBOX = &device_creator<hardbox_device>;
+const device_type HARDBOX = device_creator<hardbox_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index d14e3ad7810..f581ab40d9e 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -130,7 +130,7 @@ enum {
#define MIN_SYNC_BITS 29 // Number of bits to synchronize
// device type definition
-const device_type HP9895 = &device_creator<hp9895_device>;
+const device_type HP9895 = device_creator<hp9895_device>;
// Masks of drive selectors in XV register
static const uint8_t xv_drive_masks[] = {
diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp
index f31009c2981..5b0ba2d9197 100644
--- a/src/devices/bus/ieee488/ieee488.cpp
+++ b/src/devices/bus/ieee488/ieee488.cpp
@@ -27,8 +27,8 @@ static const char *const SIGNAL_NAME[] = { "EOI", "DAV", "NRFD", "NDAC", "IFC",
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type IEEE488 = &device_creator<ieee488_device>;
-const device_type IEEE488_SLOT = &device_creator<ieee488_slot_device>;
+const device_type IEEE488 = device_creator<ieee488_device>;
+const device_type IEEE488_SLOT = device_creator<ieee488_slot_device>;
template class device_finder<ieee488_device, false>;
template class device_finder<ieee488_device, true>;
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index 259a3336b31..10c911cca61 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -27,7 +27,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SHARK = &device_creator<mshark_device>;
+const device_type SHARK = device_creator<mshark_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 922bc0f0897..b2086a995b9 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SOFTBOX = &device_creator<softbox_device>;
+const device_type SOFTBOX = device_creator<softbox_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 8e98b8414f5..5d72030ad44 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type IMI5000H = &device_creator<imi5000h_device>;
+const device_type IMI5000H = device_creator<imi5000h_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp
index e28a3df72d7..c558770c4f6 100644
--- a/src/devices/bus/imi7000/imi7000.cpp
+++ b/src/devices/bus/imi7000/imi7000.cpp
@@ -23,8 +23,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type IMI7000_BUS = &device_creator<imi7000_bus_device>;
-const device_type IMI7000_SLOT = &device_creator<imi7000_slot_device>;
+const device_type IMI7000_BUS = device_creator<imi7000_bus_device>;
+const device_type IMI7000_SLOT = device_creator<imi7000_slot_device>;
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index f0e8540996e..006de780b73 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -19,21 +19,22 @@
#include "emu.h"
#include "ecs.h"
+#include "speaker.h"
//-------------------------------------------------
// intv_ecs_device - constructor
//-------------------------------------------------
-const device_type INTV_ROM_ECS = &device_creator<intv_ecs_device>;
+const device_type INTV_ROM_ECS = device_creator<intv_ecs_device>;
intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__),
- m_snd(*this, "ay8914"),
- m_subslot(*this, "subslot"),
- m_voice_enabled(false),
- m_ramd0_enabled(false),
- m_ram88_enabled(false)
+ : intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__),
+ m_snd(*this, "ay8914"),
+ m_subslot(*this, "subslot"),
+ m_voice_enabled(false),
+ m_ramd0_enabled(false),
+ m_ram88_enabled(false)
{
}
diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp
index a9f2d2cde82..8fef5d47432 100644
--- a/src/devices/bus/intv/rom.cpp
+++ b/src/devices/bus/intv/rom.cpp
@@ -17,10 +17,10 @@
// intv_rom_device - constructor
//-------------------------------------------------
-const device_type INTV_ROM_STD = &device_creator<intv_rom_device>;
-const device_type INTV_ROM_RAM = &device_creator<intv_ram_device>;
-const device_type INTV_ROM_GFACT = &device_creator<intv_gfact_device>;
-const device_type INTV_ROM_WSMLB = &device_creator<intv_wsmlb_device>;
+const device_type INTV_ROM_STD = device_creator<intv_rom_device>;
+const device_type INTV_ROM_RAM = device_creator<intv_ram_device>;
+const device_type INTV_ROM_GFACT = device_creator<intv_gfact_device>;
+const device_type INTV_ROM_WSMLB = device_creator<intv_wsmlb_device>;
intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp
index d6c3bad9d3c..b8a6e869ba2 100644
--- a/src/devices/bus/intv/slot.cpp
+++ b/src/devices/bus/intv/slot.cpp
@@ -86,7 +86,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type INTV_CART_SLOT = &device_creator<intv_cart_slot_device>;
+const device_type INTV_CART_SLOT = device_creator<intv_cart_slot_device>;
//**************************************************************************
// Intellivision Cartridges Interface
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index 9470e1314cf..b144b0008c4 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -13,20 +13,21 @@
#include "emu.h"
#include "voice.h"
+#include "speaker.h"
//-------------------------------------------------
// intv_voice_device - constructor
//-------------------------------------------------
-const device_type INTV_ROM_VOICE = &device_creator<intv_voice_device>;
+const device_type INTV_ROM_VOICE = device_creator<intv_voice_device>;
intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__),
- m_speech(*this, "sp0256_speech"),
- m_subslot(*this, "subslot"),
- m_ramd0_enabled(false),
- m_ram88_enabled(false)
+ : intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__),
+ m_speech(*this, "sp0256_speech"),
+ m_subslot(*this, "subslot"),
+ m_ramd0_enabled(false),
+ m_ram88_enabled(false)
{
}
diff --git a/src/devices/bus/intv_ctrl/ctrl.cpp b/src/devices/bus/intv_ctrl/ctrl.cpp
index d34a25baff0..510ac13cba8 100644
--- a/src/devices/bus/intv_ctrl/ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ctrl.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type INTV_CONTROL_PORT = &device_creator<intv_control_port_device>;
+const device_type INTV_CONTROL_PORT = device_creator<intv_control_port_device>;
//**************************************************************************
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
index 18b2c328263..4b187442585 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
@@ -30,7 +30,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type INTVECS_CONTROL_PORT = &device_creator<intvecs_control_port_device>;
+const device_type INTVECS_CONTROL_PORT = device_creator<intvecs_control_port_device>;
//**************************************************************************
@@ -137,7 +137,7 @@ SLOT_INTERFACE_END
// ECS_CTRLS - A pair of hand controllers
//-------------------------------------------------
-const device_type ECS_CTRLS = &device_creator<intvecs_ctrls_device>;
+const device_type ECS_CTRLS = device_creator<intvecs_ctrls_device>;
static SLOT_INTERFACE_START( intvecs_controller )
SLOT_INTERFACE("handctrl", INTV_HANDCTRL)
@@ -184,7 +184,7 @@ uint8_t intvecs_ctrls_device::read_portB()
// ECS_KEYBD - Keyboard
//-------------------------------------------------
-const device_type ECS_KEYBD = &device_creator<intvecs_keybd_device>;
+const device_type ECS_KEYBD = device_creator<intvecs_keybd_device>;
static INPUT_PORTS_START( intvecs_keybd )
/*
@@ -320,7 +320,7 @@ void intvecs_keybd_device::write_portA(uint8_t data)
// ECS_SYNTH - Synth
//-------------------------------------------------
-const device_type ECS_SYNTH = &device_creator<intvecs_synth_device>;
+const device_type ECS_SYNTH = device_creator<intvecs_synth_device>;
static INPUT_PORTS_START( intvecs_synth )
diff --git a/src/devices/bus/intv_ctrl/handctrl.cpp b/src/devices/bus/intv_ctrl/handctrl.cpp
index ae0e6910e6c..6208c270ab6 100644
--- a/src/devices/bus/intv_ctrl/handctrl.cpp
+++ b/src/devices/bus/intv_ctrl/handctrl.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type INTV_HANDCTRL = &device_creator<intv_handctrl_device>;
+const device_type INTV_HANDCTRL = device_creator<intv_handctrl_device>;
static INPUT_PORTS_START( intv_handctrl )
diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp
index d4eb9cb2139..3ce901c61fb 100644
--- a/src/devices/bus/iq151/disc2.cpp
+++ b/src/devices/bus/iq151/disc2.cpp
@@ -38,7 +38,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>;
+const device_type IQ151_DISC2 = device_creator<iq151_disc2_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index 5e8793bb432..4eda406479f 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "grafik.h"
+#include "screen.h"
#define LOG 0
@@ -27,7 +28,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>;
+const device_type IQ151_GRAFIK = device_creator<iq151_grafik_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp
index 4ee7a96b31f..355c556d48e 100644
--- a/src/devices/bus/iq151/iq151.cpp
+++ b/src/devices/bus/iq151/iq151.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151CART_SLOT = &device_creator<iq151cart_slot_device>;
+const device_type IQ151CART_SLOT = device_creator<iq151cart_slot_device>;
//**************************************************************************
// IQ151 cartridge interface
diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp
index 6aba0a7b8b5..10572aa553c 100644
--- a/src/devices/bus/iq151/minigraf.cpp
+++ b/src/devices/bus/iq151/minigraf.cpp
@@ -37,7 +37,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>;
+const device_type IQ151_MINIGRAF = device_creator<iq151_minigraf_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp
index af894b85f40..12e514b15ac 100644
--- a/src/devices/bus/iq151/ms151a.cpp
+++ b/src/devices/bus/iq151/ms151a.cpp
@@ -36,7 +36,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>;
+const device_type IQ151_MS151A = device_creator<iq151_ms151a_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp
index 8a2f1816433..076efa1f5a2 100644
--- a/src/devices/bus/iq151/rom.cpp
+++ b/src/devices/bus/iq151/rom.cpp
@@ -27,11 +27,11 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_BASIC6 = &device_creator<iq151_basic6_device>;
-const device_type IQ151_BASICG = &device_creator<iq151_basicg_device>;
-const device_type IQ151_AMOS1 = &device_creator<iq151_amos1_device>;
-const device_type IQ151_AMOS2 = &device_creator<iq151_amos2_device>;
-const device_type IQ151_AMOS3 = &device_creator<iq151_amos3_device>;
+const device_type IQ151_BASIC6 = device_creator<iq151_basic6_device>;
+const device_type IQ151_BASICG = device_creator<iq151_basicg_device>;
+const device_type IQ151_AMOS1 = device_creator<iq151_amos1_device>;
+const device_type IQ151_AMOS2 = device_creator<iq151_amos2_device>;
+const device_type IQ151_AMOS3 = device_creator<iq151_amos3_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 7e9225e4297..692c4e9431a 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -34,7 +34,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_STAPER = &device_creator<iq151_staper_device>;
+const device_type IQ151_STAPER = device_creator<iq151_staper_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp
index 09b245d1336..b9d4beb92ea 100644
--- a/src/devices/bus/iq151/video32.cpp
+++ b/src/devices/bus/iq151/video32.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "video32.h"
+#include "screen.h"
/***************************************************************************
@@ -40,7 +41,7 @@ static const gfx_layout iq151_video32_charlayout =
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>;
+const device_type IQ151_VIDEO32 = device_creator<iq151_video32_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp
index cfa70c7d469..0ee3b71dd4b 100644
--- a/src/devices/bus/iq151/video64.cpp
+++ b/src/devices/bus/iq151/video64.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "video64.h"
+#include "screen.h"
+
/***************************************************************************
IMPLEMENTATION
@@ -40,7 +42,7 @@ static const gfx_layout iq151_video64_charlayout =
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>;
+const device_type IQ151_VIDEO64 = device_creator<iq151_video64_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index 8caa4abe4e8..a34983062bb 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -12,7 +12,7 @@ static MACHINE_CONFIG_FRAGMENT(el2_3c503_config)
MCFG_DP8390D_MEM_WRITE_CB(WRITE8(el2_3c503_device, el2_3c503_mem_write))
MACHINE_CONFIG_END
-const device_type EL2_3C503 = &device_creator<el2_3c503_device>;
+const device_type EL2_3C503 = device_creator<el2_3c503_device>;
machine_config_constructor el2_3c503_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(el2_3c503_config);
diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp
index 9523a61ac61..3efe0d29213 100644
--- a/src/devices/bus/isa/3c505.cpp
+++ b/src/devices/bus/isa/3c505.cpp
@@ -296,7 +296,7 @@ INPUT_PORTS_END
***************************************************************************/
// device type definition
-const device_type ISA16_3C505 = &device_creator<threecom3c505_device> ;
+const device_type ISA16_3C505 = device_creator<threecom3c505_device> ;
//-------------------------------------------------
// threecom3c505_device - constructor
diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp
index 206ffe878cb..4193091f9d2 100644
--- a/src/devices/bus/isa/adlib.cpp
+++ b/src/devices/bus/isa/adlib.cpp
@@ -8,7 +8,10 @@
#include "emu.h"
#include "adlib.h"
-#include "sound/speaker.h"
+
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#define ym3812_StdClock 3579545
@@ -41,7 +44,7 @@ WRITE8_MEMBER( isa8_adlib_device::ym3812_16_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_ADLIB = &device_creator<isa8_adlib_device>;
+const device_type ISA8_ADLIB = device_creator<isa8_adlib_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index ff0c05c8e54..ad4269dba8b 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -51,7 +51,7 @@ INPUT_PORTS_END
#define CGA_MONITOR (m_cga_config->read()&0x1C)
#define CGA_MONITOR_COMPOSITE 0x08 /* Colour composite */
-const device_type ISA8_AGA = &device_creator<isa8_aga_device>;
+const device_type ISA8_AGA = device_creator<isa8_aga_device>;
//-------------------------------------------------
// isa8_aga_device - constructor
@@ -159,7 +159,7 @@ ioport_constructor isa8_aga_device::device_input_ports() const
-const device_type ISA8_AGA_PC200 = &device_creator<isa8_aga_pc200_device>;
+const device_type ISA8_AGA_PC200 = device_creator<isa8_aga_pc200_device>;
//-------------------------------------------------
// isa8_aga_pc200_device - constructor
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index 9218b7cf08c..0ca3b9ca80e 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -134,7 +134,7 @@
#define CMD_EXTBIOS 0x28 // return extended BIOS information
#define CMD_MBENABLE 0x29 // set mailbox interface enable
-const device_type AHA1542 = &device_creator<aha1542_device>;
+const device_type AHA1542 = device_creator<aha1542_device>;
#define Z84C0010_TAG "u5"
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 99f446b7524..f44cdfb5900 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -273,7 +273,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_CGA = &device_creator<isa8_cga_device>;
+const device_type ISA8_CGA = device_creator<isa8_cga_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -439,7 +439,7 @@ uint32_t isa8_cga_device::screen_update(screen_device &screen, bitmap_rgb32 &bit
}
-const device_type ISA8_CGA_POISK2 = &device_creator<isa8_cga_poisk2_device>;
+const device_type ISA8_CGA_POISK2 = device_creator<isa8_cga_poisk2_device>;
//-------------------------------------------------
// isa8_cga_poisk2_device - constructor
@@ -468,7 +468,7 @@ const tiny_rom_entry *isa8_cga_poisk2_device::device_rom_region() const
/* for superimposing CGA over a different source video (i.e. tetriskr) */
-const device_type ISA8_CGA_SUPERIMPOSE = &device_creator<isa8_cga_superimpose_device>;
+const device_type ISA8_CGA_SUPERIMPOSE = device_creator<isa8_cga_superimpose_device>;
//-------------------------------------------------
// isa8_cga_superimpose_device - constructor
@@ -1538,7 +1538,7 @@ WRITE8_MEMBER( isa8_cga_pc1512_device::vram_w )
}
-const device_type ISA8_CGA_PC1512 = &device_creator<isa8_cga_pc1512_device>;
+const device_type ISA8_CGA_PC1512 = device_creator<isa8_cga_pc1512_device>;
const offs_t isa8_cga_pc1512_device::vram_offset[4]= { 0x0000, 0x4000, 0x8000, 0xC000 };
const uint8_t isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
@@ -1673,7 +1673,7 @@ READ8_MEMBER( isa8_wyse700_device::io_read )
}
-const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>;
+const device_type ISA8_WYSE700 = device_creator<isa8_wyse700_device>;
//-------------------------------------------------
@@ -1762,7 +1762,7 @@ uint32_t isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32
}
-const device_type ISA8_EC1841_0002 = &device_creator<isa8_ec1841_0002_device>;
+const device_type ISA8_EC1841_0002 = device_creator<isa8_ec1841_0002_device>;
//-------------------------------------------------
// isa8_ec1841_0002_device - constructor
@@ -1848,7 +1848,7 @@ READ8_MEMBER( isa8_ec1841_0002_device::io_read )
return data;
}
-const device_type ISA8_CGA_MC1502 = &device_creator<isa8_cga_mc1502_device>;
+const device_type ISA8_CGA_MC1502 = device_creator<isa8_cga_mc1502_device>;
//-------------------------------------------------
// isa8_cga_mc1502_device - constructor
@@ -1877,7 +1877,7 @@ const tiny_rom_entry *isa8_cga_iskr1031_device::device_rom_region() const
return ROM_NAME( cga_iskr1031 );
}
-const device_type ISA8_CGA_ISKR1031 = &device_creator<isa8_cga_iskr1031_device>;
+const device_type ISA8_CGA_ISKR1031 = device_creator<isa8_cga_iskr1031_device>;
//-------------------------------------------------
// isa8_cga_iskr1031_device - constructor
@@ -1902,7 +1902,7 @@ const tiny_rom_entry *isa8_cga_iskr1030m_device::device_rom_region() const
return ROM_NAME( cga_iskr1030m );
}
-const device_type ISA8_CGA_ISKR1030M = &device_creator<isa8_cga_iskr1030m_device>;
+const device_type ISA8_CGA_ISKR1030M = device_creator<isa8_cga_iskr1030m_device>;
//-------------------------------------------------
// isa8_cga_iskr1030m_device - constructor
@@ -1926,7 +1926,7 @@ const tiny_rom_entry *isa8_cga_mc1502_device::device_rom_region() const
return ROM_NAME( mc1502 );
}
-const device_type ISA8_CGA_M24 = &device_creator<isa8_cga_m24_device>;
+const device_type ISA8_CGA_M24 = device_creator<isa8_cga_m24_device>;
static MACHINE_CONFIG_DERIVED( m24, cga )
MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME)
diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h
index 5d253340a50..2b34695cc83 100644
--- a/src/devices/bus/isa/cga.h
+++ b/src/devices/bus/isa/cga.h
@@ -1,12 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#pragma once
+#ifndef MAME_DEVICE_BUS_ISA_CGA_H
+#define MAME_DEVICE_BUS_ISA_CGA_H
-#ifndef __ISA_CGA_H__
-#define __ISA_CGA_H__
+#pragma once
#include "isa.h"
#include "video/mc6845.h"
+#include "screen.h"
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -285,4 +287,4 @@ private:
// device type definition
extern const device_type ISA8_CGA_M24;
-#endif /* __ISA_CGA_H__ */
+#endif // MAME_DEVICE_BUS_ISA_CGA_H
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index b3ebd9f7d41..bce1eab2120 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -76,7 +76,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_COM = &device_creator<isa8_com_device>;
+const device_type ISA8_COM = device_creator<isa8_com_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -173,7 +173,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_COM_AT = &device_creator<isa8_com_at_device>;
+const device_type ISA8_COM_AT = device_creator<isa8_com_at_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 958fb139920..5995db6b5a2 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -2,9 +2,12 @@
// copyright-holders:Carl
#include "emu.h"
#include "dectalk.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
-const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>;
+const device_type ISA8_DECTALK = device_creator<dectalk_isa_device>;
dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__),
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index e782c18573b..74ce338e480 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -446,6 +446,9 @@ located at I/O port 0x3CE, and a data register located at I/O port 0x3CF.
#include "emu.h"
#include "ega.h"
+#include "screen.h"
+
+
#define VERBOSE_EGA 1
#define EGA_SCREEN_NAME "ega_screen"
@@ -535,7 +538,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_EGA = &device_creator<isa8_ega_device>;
+const device_type ISA8_EGA = device_creator<isa8_ega_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index 807e9cfebc5..a6b6cdd19ca 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -160,8 +160,8 @@ machine_config_constructor isa8_fdc_superio_device::device_mconfig_additions() c
return MACHINE_CONFIG_NAME(cfg_superio);
}
-const device_type ISA8_FDC_XT = &device_creator<isa8_fdc_xt_device>;
-const device_type ISA8_FDC_AT = &device_creator<isa8_fdc_at_device>;
-const device_type ISA8_FDC_SMC = &device_creator<isa8_fdc_smc_device>;
-const device_type ISA8_FDC_PS2 = &device_creator<isa8_fdc_ps2_device>;
-const device_type ISA8_FDC_SUPERIO = &device_creator<isa8_fdc_superio_device>;
+const device_type ISA8_FDC_XT = device_creator<isa8_fdc_xt_device>;
+const device_type ISA8_FDC_AT = device_creator<isa8_fdc_at_device>;
+const device_type ISA8_FDC_SMC = device_creator<isa8_fdc_smc_device>;
+const device_type ISA8_FDC_PS2 = device_creator<isa8_fdc_ps2_device>;
+const device_type ISA8_FDC_SUPERIO = device_creator<isa8_fdc_superio_device>;
diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp
index 53001ee026b..00ce6f31a92 100644
--- a/src/devices/bus/isa/finalchs.cpp
+++ b/src/devices/bus/isa/finalchs.cpp
@@ -69,7 +69,7 @@ WRITE8_MEMBER( isa8_finalchs_device::finalchs_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_FINALCHS = &device_creator<isa8_finalchs_device>;
+const device_type ISA8_FINALCHS = device_creator<isa8_finalchs_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp
index 59bd7086b85..9ff7d0d9f3c 100644
--- a/src/devices/bus/isa/gblaster.cpp
+++ b/src/devices/bus/isa/gblaster.cpp
@@ -8,7 +8,9 @@
#include "emu.h"
#include "gblaster.h"
-#include "sound/speaker.h"
+
+#include "sound/spkrdev.h"
+#include "speaker.h"
/*
creative labs game blaster (CMS creative music system)
@@ -76,7 +78,7 @@ WRITE8_MEMBER( isa8_gblaster_device::detect_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_GAME_BLASTER = &device_creator<isa8_gblaster_device>;
+const device_type ISA8_GAME_BLASTER = device_creator<isa8_gblaster_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index e956a11abc2..a81a2f7a57f 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -9,8 +9,10 @@
#include "emu.h"
#include "gus.h"
+
#include "bus/midi/midi.h"
#include "machine/clock.h"
+#include "speaker.h"
//**************************************************************************
@@ -34,8 +36,8 @@ static const uint16_t volume_ramp_table[4] =
1, 8, 64, 512
};
-const device_type GGF1 = &device_creator<gf1_device>;
-const device_type ISA16_GUS = &device_creator<isa16_gus_device>;
+const device_type GGF1 = device_creator<gf1_device>;
+const device_type ISA16_GUS = device_creator<isa16_gus_device>;
#ifdef LOG_SOUND
FILE* f;
diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp
index 10bd50349d0..798f9a5d362 100644
--- a/src/devices/bus/isa/hdc.cpp
+++ b/src/devices/bus/isa/hdc.cpp
@@ -157,9 +157,9 @@ static INPUT_PORTS_START( isa_hdc )
PORT_DIPSETTING( 0x00, DEF_STR(No) )
INPUT_PORTS_END
-const device_type XT_HDC = &device_creator<xt_hdc_device>;
-const device_type EC1841_HDC = &device_creator<ec1841_device>;
-const device_type ST11M_HDC = &device_creator<st11m_device>;
+const device_type XT_HDC = device_creator<xt_hdc_device>;
+const device_type EC1841_HDC = device_creator<ec1841_device>;
+const device_type ST11M_HDC = device_creator<st11m_device>;
xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0),
@@ -928,8 +928,8 @@ void xt_hdc_device::set_ready()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_HDC = &device_creator<isa8_hdc_device>;
-const device_type ISA8_HDC_EC1841 = &device_creator<isa8_hdc_ec1841_device>;
+const device_type ISA8_HDC = device_creator<isa8_hdc_device>;
+const device_type ISA8_HDC_EC1841 = device_creator<isa8_hdc_ec1841_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index 223af4ed0dd..2b1b5f17fcb 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -18,9 +18,11 @@
#include "emu.h"
#include "ibm_mfc.h"
+
#include "cpu/z80/z80.h"
#include "machine/clock.h"
#include "machine/pit8253.h"
+#include "speaker.h"
//-------------------------------------------------
@@ -61,7 +63,7 @@ enum
// Globals
//-------------------------------------------------
-const device_type ISA8_IBM_MFC = &device_creator<isa8_ibm_mfc_device>;
+const device_type ISA8_IBM_MFC = device_creator<isa8_ibm_mfc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index 9d32d017496..d932543a586 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -8,8 +8,11 @@
#include "emu.h"
#include "ide.h"
-#include "machine/idectrl.h"
+
#include "imagedev/harddriv.h"
+#include "machine/idectrl.h"
+#include "speaker.h"
+
READ8_MEMBER(isa16_ide_device::ide16_alt_r )
{
@@ -70,7 +73,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_IDE = &device_creator<isa16_ide_device>;
+const device_type ISA16_IDE = device_creator<isa16_ide_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp
index 86c6a4f9687..17cbf8fc770 100644
--- a/src/devices/bus/isa/isa.cpp
+++ b/src/devices/bus/isa/isa.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_SLOT = &device_creator<isa8_slot_device>;
+const device_type ISA8_SLOT = device_creator<isa8_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -64,7 +64,7 @@ void isa8_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_SLOT = &device_creator<isa16_slot_device>;
+const device_type ISA16_SLOT = device_creator<isa16_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -100,7 +100,7 @@ void isa16_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8 = &device_creator<isa8_device>;
+const device_type ISA8 = device_creator<isa8_device>;
void isa8_device::static_set_cputag(device_t &device, const char *tag)
{
@@ -455,7 +455,7 @@ void device_isa8_card_interface::set_isa_device()
}
-const device_type ISA16 = &device_creator<isa16_device>;
+const device_type ISA16 = device_creator<isa16_device>;
//-------------------------------------------------
// isa16_device - constructor
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index 6d43df86307..5f1e0f24917 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -10,7 +10,7 @@
#include "lpt.h"
#include "machine/pc_lpt.h"
-const device_type ISA8_LPT = &device_creator<isa8_lpt_device>;
+const device_type ISA8_LPT = device_creator<isa8_lpt_device>;
isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp
index 716abcade1f..a40503f8769 100644
--- a/src/devices/bus/isa/mach32.cpp
+++ b/src/devices/bus/isa/mach32.cpp
@@ -12,10 +12,13 @@
#include "emu.h"
#include "mach32.h"
-const device_type ATIMACH32 = &device_creator<mach32_device>;
-const device_type ATIMACH32_8514A = &device_creator<mach32_8514a_device>;
-const device_type ATIMACH64 = &device_creator<mach64_device>;
-const device_type ATIMACH64_8514A = &device_creator<mach64_8514a_device>;
+#include "screen.h"
+
+
+const device_type ATIMACH32 = device_creator<mach32_device>;
+const device_type ATIMACH32_8514A = device_creator<mach32_8514a_device>;
+const device_type ATIMACH64 = device_creator<mach64_device>;
+const device_type ATIMACH64_8514A = device_creator<mach64_8514a_device>;
/*
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 7232cfb8236..6f514c7e3f3 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MC1502_FDC = &device_creator<mc1502_fdc_device>;
+const device_type MC1502_FDC = device_creator<mc1502_fdc_device>;
FLOPPY_FORMATS_MEMBER( mc1502_fdc_device::floppy_formats )
FLOPPY_PC_FORMAT
diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp
index 99aa8e5d84d..cbc36c38e18 100644
--- a/src/devices/bus/isa/mc1502_rom.cpp
+++ b/src/devices/bus/isa/mc1502_rom.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MC1502_ROM = &device_creator<mc1502_rom_device>;
+const device_type MC1502_ROM = device_creator<mc1502_rom_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp
index 5cd0b6bf378..d31896f43f0 100644
--- a/src/devices/bus/isa/mcd.cpp
+++ b/src/devices/bus/isa/mcd.cpp
@@ -17,7 +17,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_MCD = &device_creator<mcd_isa_device>;
+const device_type ISA16_MCD = device_creator<mcd_isa_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index 6887372003b..e311ce1c1ee 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -8,8 +8,11 @@
#include "emu.h"
#include "mda.h"
-#include "video/mc6845.h"
+
#include "machine/pc_lpt.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
#define MDA_SCREEN_NAME "mda_screen"
#define MDA_MC6845_NAME "mc6845_mda"
@@ -120,7 +123,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_MDA = &device_creator<isa8_mda_device>;
+const device_type ISA8_MDA = device_creator<isa8_mda_device>;
//-------------------------------------------------
@@ -558,7 +561,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_HERCULES = &device_creator<isa8_hercules_device>;
+const device_type ISA8_HERCULES = device_creator<isa8_hercules_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -776,7 +779,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_ec1840_0002 )
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_mda_device, vsync_changed))
MACHINE_CONFIG_END
-const device_type ISA8_EC1840_0002 = &device_creator<isa8_ec1840_0002_device>;
+const device_type ISA8_EC1840_0002 = device_creator<isa8_ec1840_0002_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index bb80e14d7e1..2690f6e333f 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -45,7 +45,7 @@ WRITE_LINE_MEMBER( isa8_mpu401_device::mpu_irq_out )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_MPU401 = &device_creator<isa8_mpu401_device>;
+const device_type ISA8_MPU401 = device_creator<isa8_mpu401_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index 87f9e668968..3a88ce16ec7 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -24,8 +24,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_FDC344 = &device_creator<fdc344_device>;
-const device_type ISA8_FDCMAG = &device_creator<fdcmag_device>;
+const device_type ISA8_FDC344 = device_creator<fdc344_device>;
+const device_type ISA8_FDCMAG = device_creator<fdcmag_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index ed4b46df88e..9f4e61491a3 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -10,7 +10,7 @@ static MACHINE_CONFIG_FRAGMENT(ne1000_config)
MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne1000_device, ne1000_mem_write))
MACHINE_CONFIG_END
-const device_type NE1000 = &device_creator<ne1000_device>;
+const device_type NE1000 = device_creator<ne1000_device>;
machine_config_constructor ne1000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne1000_config);
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index 8a6e44b8ced..d53564cb59f 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -11,7 +11,7 @@ static MACHINE_CONFIG_FRAGMENT(ne2000_config)
MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne2000_device, ne2000_mem_write))
MACHINE_CONFIG_END
-const device_type NE2000 = &device_creator<ne2000_device>;
+const device_type NE2000 = device_creator<ne2000_device>;
machine_config_constructor ne2000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne2000_config);
diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp
index 69a4641206b..c2ee133c394 100644
--- a/src/devices/bus/isa/num9rev.cpp
+++ b/src/devices/bus/isa/num9rev.cpp
@@ -5,12 +5,14 @@
#include "emu.h"
#include "num9rev.h"
+#include "screen.h"
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_NUM_9_REV = &device_creator<isa8_number_9_rev_device>;
+const device_type ISA8_NUM_9_REV = device_creator<isa8_number_9_rev_device>;
static ADDRESS_MAP_START( upd7220_map, AS_0, 16, isa8_number_9_rev_device )
AM_RANGE(0x00000, 0x3ffff) AM_NOP
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index 096179a4d7e..f6c3bfff8d8 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -375,14 +375,14 @@ void omti8621_device::device_reset()
alternate_track_address[1] = 0;
}
-const device_type ISA16_OMTI8621 = &device_creator<omti8621_pc_device>;
+const device_type ISA16_OMTI8621 = device_creator<omti8621_pc_device>;
omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock)
{
}
-const device_type ISA16_OMTI8621_APOLLO = &device_creator<omti8621_apollo_device>;
+const device_type ISA16_OMTI8621_APOLLO = device_creator<omti8621_apollo_device>;
omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock)
@@ -1309,7 +1309,7 @@ void omti8621_device::eop_w(int state)
//##########################################################################
// device type definition
-const device_type OMTI_DISK = &device_creator<omti_disk_image_device>;
+const device_type OMTI_DISK = device_creator<omti_disk_image_device>;
omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__),
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 2c537923cdc..4cca541298a 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type P1_FDC = &device_creator<p1_fdc_device>;
+const device_type P1_FDC = device_creator<p1_fdc_device>;
FLOPPY_FORMATS_MEMBER( p1_fdc_device::floppy_formats )
FLOPPY_PC_FORMAT
diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp
index 963a8b14b78..47ab6ed6853 100644
--- a/src/devices/bus/isa/p1_hdc.cpp
+++ b/src/devices/bus/isa/p1_hdc.cpp
@@ -33,7 +33,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type P1_HDC = &device_creator<p1_hdc_device>;
+const device_type P1_HDC = device_creator<p1_hdc_device>;
static MACHINE_CONFIG_FRAGMENT( hdc_b942 )
MCFG_DEVICE_ADD(KM1809VG7_TAG, WD2010, 5000000) // XXX clock?
diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp
index 80aefe011e7..48d61233895 100644
--- a/src/devices/bus/isa/p1_rom.cpp
+++ b/src/devices/bus/isa/p1_rom.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type P1_ROM = &device_creator<p1_rom_device>;
+const device_type P1_ROM = device_creator<p1_rom_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index a1afa847a6b..4a173a8db47 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -13,13 +13,16 @@
#include "emu.h"
#include "p1_sound.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type P1_SOUND = &device_creator<p1_sound_device>;
+const device_type P1_SOUND = device_creator<p1_sound_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp
index 5511d21ca42..69d3e037edf 100644
--- a/src/devices/bus/isa/pc1640_iga.cpp
+++ b/src/devices/bus/isa/pc1640_iga.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_PC1640_IGA = &device_creator<isa8_pc1640_iga_device>;
+const device_type ISA8_PC1640_IGA = device_creator<isa8_pc1640_iga_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp
index 9b10e9c31b7..f4567c234e2 100644
--- a/src/devices/bus/isa/pds.cpp
+++ b/src/devices/bus/isa/pds.cpp
@@ -19,7 +19,7 @@
#include "emu.h"
#include "pds.h"
-const device_type ISA8_PDS = &device_creator<isa8_pds_device>;
+const device_type ISA8_PDS = device_creator<isa8_pds_device>;
isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_PDS, "Programmers Development System", tag, owner, clock, "isa_pds", __FILE__),
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index 8225c4724fc..3d004231fbf 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -27,9 +27,11 @@
***************************************************************************/
#include "emu.h"
-
#include "pgc.h"
+#include "screen.h"
+
+
#define VERBOSE_PGC 1
#define DBG_LOG(N,M,A) \
@@ -164,7 +166,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_PGC = &device_creator<isa8_pgc_device>;
+const device_type ISA8_PGC = device_creator<isa8_pgc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp
index 7812b38db69..b9df7bca59b 100644
--- a/src/devices/bus/isa/s3virge.cpp
+++ b/src/devices/bus/isa/s3virge.cpp
@@ -14,12 +14,15 @@
#include "emu.h"
#include "s3virge.h"
-#define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0)
+#include "screen.h"
+
+
+#define CRTC_PORT_ADDR ((vga.miscellaneous_output & 1) ? 0x3d0 : 0x3b0)
#define LOG_REG 1
-const device_type S3VIRGE = &device_creator<s3virge_vga_device>;
-const device_type S3VIRGEDX = &device_creator<s3virgedx_vga_device>;
-const device_type S3VIRGEDX1 = &device_creator<s3virgedx_rev1_vga_device>;
+const device_type S3VIRGE = device_creator<s3virge_vga_device>;
+const device_type S3VIRGEDX = device_creator<s3virgedx_vga_device>;
+const device_type S3VIRGEDX1 = device_creator<s3virgedx_rev1_vga_device>;
s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: s3_vga_device(mconfig, S3VIRGE, "S3 86C325", tag, owner, clock, "virge_vga", __FILE__)
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index bcd4d635ec1..f820f707adb 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -9,7 +9,10 @@
#include "emu.h"
#include "sb16.h"
-const device_type ISA16_SB16 = &device_creator<sb16_lle_device>;
+#include "speaker.h"
+
+
+const device_type ISA16_SB16 = device_creator<sb16_lle_device>;
READ8_MEMBER( sb16_lle_device::dsp_data_r )
{
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index 7288f654e90..64998b89a71 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -13,11 +13,15 @@
#include "emu.h"
#include "sblaster.h"
+
#include "machine/pic8259.h"
-#include "sound/speaker.h"
#include "sound/262intf.h"
+#include "sound/spkrdev.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
+
/*
adlib (YM3812/OPL2 chip), part of many many soundcards (soundblaster)
soundblaster: YM3812 also accessible at 0x228/9 (address jumperable)
@@ -1190,9 +1194,9 @@ ioport_constructor sb16_device::device_input_ports() const
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_SOUND_BLASTER_1_0 = &device_creator<isa8_sblaster1_0_device>;
-const device_type ISA8_SOUND_BLASTER_1_5 = &device_creator<isa8_sblaster1_5_device>;
-const device_type ISA16_SOUND_BLASTER_16 = &device_creator<isa16_sblaster16_device>;
+const device_type ISA8_SOUND_BLASTER_1_0 = device_creator<isa8_sblaster1_0_device>;
+const device_type ISA8_SOUND_BLASTER_1_5 = device_creator<isa8_sblaster1_5_device>;
+const device_type ISA16_SOUND_BLASTER_16 = device_creator<isa16_sblaster16_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp
index 3d197791861..bc5525a2809 100644
--- a/src/devices/bus/isa/sc499.cpp
+++ b/src/devices/bus/isa/sc499.cpp
@@ -190,7 +190,7 @@ machine_config_constructor sc499_device::device_mconfig_additions() const
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_SC499 = &device_creator<sc499_device>;
+const device_type ISA8_SC499 = device_creator<sc499_device>;
//**************************************************************************
// CONSTANTS
@@ -309,7 +309,7 @@ const device_type ISA8_SC499 = &device_creator<sc499_device>;
***************************************************************************/
// device type definition
-const device_type SC499 = &device_creator<sc499_device>;
+const device_type SC499 = device_creator<sc499_device>;
//-------------------------------------------------
// sc499_device - constructor
@@ -1301,7 +1301,7 @@ void sc499_device::block_set_filemark()
//##########################################################################
-const device_type SC499_CTAPE = &device_creator<sc499_ctape_image_device>;
+const device_type SC499_CTAPE = device_creator<sc499_ctape_image_device>;
sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__),
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index 463e882896b..785703f07f8 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_SIDE116 = &device_creator<side116_device>;
+const device_type ISA8_SIDE116 = device_creator<side116_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index dd0ad8ad5b7..1d2669c8420 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -5,7 +5,10 @@
#include "emu.h"
#include "ssi2001.h"
-const device_type ISA8_SSI2001 = &device_creator<ssi2001_device>;
+#include "speaker.h"
+
+
+const device_type ISA8_SSI2001 = device_creator<ssi2001_device>;
static MACHINE_CONFIG_FRAGMENT( ssi2001 )
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index fe83c94cf73..079c4d15b75 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -6,10 +6,13 @@
#include "emu.h"
#include "stereo_fx.h"
+
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
-const device_type ISA8_STEREO_FX = &device_creator<stereo_fx_device>;
+const device_type ISA8_STEREO_FX = device_creator<stereo_fx_device>;
READ8_MEMBER( stereo_fx_device::dev_dsp_data_r )
{
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index 1343d08e612..f5f117e76bb 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -9,6 +9,9 @@
#include "emu.h"
#include "svga_cirrus.h"
+#include "screen.h"
+
+
ROM_START( dm_clgd5430 )
ROM_REGION(0x8000,"dm_clgd5430", 0)
ROM_LOAD("speedstar_pro_se_v1.00.u2", 0x00000, 0x8000, CRC(ed79572c) SHA1(15131e2b2db7a34971083a250e4a21ab7bd64a9d) )
@@ -19,8 +22,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_SVGA_CIRRUS = &device_creator<isa16_svga_cirrus_device>;
-const device_type ISA16_SVGA_CIRRUS_GD542X = &device_creator<isa16_svga_cirrus_gd542x_device>;
+const device_type ISA16_SVGA_CIRRUS = device_creator<isa16_svga_cirrus_device>;
+const device_type ISA16_SVGA_CIRRUS_GD542X = device_creator<isa16_svga_cirrus_gd542x_device>;
static MACHINE_CONFIG_FRAGMENT( vga_cirrus )
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index cf539a0b8e3..1414022b132 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -9,6 +9,9 @@
#include "emu.h"
#include "svga_s3.h"
+#include "screen.h"
+
+
ROM_START( s3_764 )
ROM_REGION(0x8000,"s3_764", 0)
ROM_DEFAULT_BIOS("9fxv330")
@@ -30,7 +33,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_SVGA_S3 = &device_creator<isa16_svga_s3_device>;
+const device_type ISA16_SVGA_S3 = device_creator<isa16_svga_s3_device>;
static MACHINE_CONFIG_FRAGMENT( vga_s3 )
@@ -142,7 +145,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_S3VIRGE = &device_creator<isa16_s3virge_device>;
+const device_type ISA16_S3VIRGE = device_creator<isa16_s3virge_device>;
static MACHINE_CONFIG_FRAGMENT( vga_s3virge )
@@ -239,7 +242,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_S3VIRGEDX = &device_creator<isa16_s3virgedx_device>;
+const device_type ISA16_S3VIRGEDX = device_creator<isa16_s3virgedx_device>;
//-------------------------------------------------
@@ -327,7 +330,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_DMS3D2KPRO = &device_creator<isa16_stealth3d2kpro_device>;
+const device_type ISA16_DMS3D2KPRO = device_creator<isa16_stealth3d2kpro_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index e12eb1153c8..505737ec8e6 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -10,6 +10,8 @@
#include "svga_trident.h"
#include "video/pc_vga.h"
+#include "screen.h"
+
ROM_START( tgui9680 )
ROM_REGION( 0x8000, "tgui9680", 0 )
@@ -21,7 +23,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_SVGA_TGUI9680 = &device_creator<isa16_svga_tgui9680_device>;
+const device_type ISA16_SVGA_TGUI9680 = device_creator<isa16_svga_tgui9680_device>;
static MACHINE_CONFIG_FRAGMENT( vga_trident )
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index c71a6f9a82c..8fa56a6c4ff 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -10,6 +10,9 @@
#include "svga_tseng.h"
#include "video/pc_vga.h"
+#include "screen.h"
+
+
ROM_START( et4000 )
ROM_REGION(0x8000,"et4000", 0)
ROM_LOAD("et4000.bin", 0x00000, 0x8000, CRC(f1e817a8) SHA1(945d405b0fb4b8f26830d495881f8587d90e5ef9) )
@@ -19,7 +22,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_SVGA_ET4K = &device_creator<isa8_svga_et4k_device>;
+const device_type ISA8_SVGA_ET4K = device_creator<isa8_svga_et4k_device>;
static MACHINE_CONFIG_FRAGMENT( vga_tseng )
diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp
index 5f97774ceba..72ff1f21fbd 100644
--- a/src/devices/bus/isa/trident.cpp
+++ b/src/devices/bus/isa/trident.cpp
@@ -10,10 +10,13 @@
#include "emu.h"
#include "trident.h"
+
#include "debugger.h"
+#include "screen.h"
+
-const device_type TRIDENT_VGA = &device_creator<tgui9860_device>;
-const device_type TVGA9000_VGA = &device_creator<tvga9000_device>;
+const device_type TRIDENT_VGA = device_creator<tgui9860_device>;
+const device_type TVGA9000_VGA = device_creator<tvga9000_device>;
#define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0)
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index 371ec5d899c..24c7d457958 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -19,7 +19,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_VGA = &device_creator<isa8_vga_device>;
+const device_type ISA8_VGA = device_creator<isa8_vga_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 57be162e365..1b0238d77ab 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -18,7 +18,10 @@
#include "emu.h"
#include "vga_ati.h"
#include "mach32.h"
+
#include "video/pc_vga.h"
+#include "screen.h"
+
ROM_START( gfxultra )
ROM_REGION(0x8000,"gfxultra", 0)
@@ -65,9 +68,9 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA16_VGA_GFXULTRA = &device_creator<isa16_vga_gfxultra_device>;
-const device_type ISA16_SVGA_GFXULTRAPRO = &device_creator<isa16_vga_gfxultrapro_device>;
-const device_type ISA16_SVGA_MACH64 = &device_creator<isa16_vga_mach64_device>;
+const device_type ISA16_VGA_GFXULTRA = device_creator<isa16_vga_gfxultra_device>;
+const device_type ISA16_SVGA_GFXULTRAPRO = device_creator<isa16_vga_gfxultrapro_device>;
+const device_type ISA16_SVGA_MACH64 = device_creator<isa16_vga_mach64_device>;
static MACHINE_CONFIG_FRAGMENT( vga_ati )
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp
index 1c5cb2a8674..4ce188fda51 100644
--- a/src/devices/bus/isa/wd1002a_wx1.cpp
+++ b/src/devices/bus/isa/wd1002a_wx1.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_WD1002A_WX1 = &device_creator<isa8_wd1002a_wx1_device>;
+const device_type ISA8_WD1002A_WX1 = device_creator<isa8_wd1002a_wx1_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index f6f5f788168..d2f106092ae 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -62,7 +62,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISA8_WDXT_GEN = &device_creator<wdxt_gen_device>;
+const device_type ISA8_WDXT_GEN = device_creator<wdxt_gen_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index b6f1150531e..a0e339be11e 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -262,7 +262,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ISA8_XTIDE = &device_creator<xtide_device>;
+const device_type ISA8_XTIDE = device_creator<xtide_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index 0bd66ba6937..6f06976e925 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMPIS_FDC = &device_creator<compis_fdc_device>;
+const device_type COMPIS_FDC = device_creator<compis_fdc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index 1444d54bea7..4537dbd6261 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISBC_218A = &device_creator<isbc_218a_device>;
+const device_type ISBC_218A = device_creator<isbc_218a_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp
index 17d696317ce..6746969a5b7 100644
--- a/src/devices/bus/isbx/isbx.cpp
+++ b/src/devices/bus/isbx/isbx.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ISBX_SLOT = &device_creator<isbx_slot_device>;
+const device_type ISBX_SLOT = device_creator<isbx_slot_device>;
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index 10d2290344f..d36ada24b53 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -98,7 +98,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KC_D002 = &device_creator<kc_d002_device>;
+const device_type KC_D002 = device_creator<kc_d002_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index d698ec9b970..1a08758310e 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -117,8 +117,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KC_D004 = &device_creator<kc_d004_device>;
-const device_type KC_D004_GIDE = &device_creator<kc_d004_gide_device>;
+const device_type KC_D004 = device_creator<kc_d004_device>;
+const device_type KC_D004_GIDE = device_creator<kc_d004_gide_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp
index 5ac9a424bd0..bcdef85b8a4 100644
--- a/src/devices/bus/kc/kc.cpp
+++ b/src/devices/bus/kc/kc.cpp
@@ -118,8 +118,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KCEXP_SLOT = &device_creator<kcexp_slot_device>;
-const device_type KCCART_SLOT = &device_creator<kccart_slot_device>;
+const device_type KCEXP_SLOT = device_creator<kcexp_slot_device>;
+const device_type KCCART_SLOT = device_creator<kccart_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp
index 577d0c0a194..ed55a3a9784 100644
--- a/src/devices/bus/kc/ram.cpp
+++ b/src/devices/bus/kc/ram.cpp
@@ -27,12 +27,12 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KC_M011 = &device_creator<kc_m011_device>;
-const device_type KC_M022 = &device_creator<kc_m022_device>;
-const device_type KC_M032 = &device_creator<kc_m032_device>;
-const device_type KC_M034 = &device_creator<kc_m034_device>;
-const device_type KC_M035 = &device_creator<kc_m035_device>;
-const device_type KC_M036 = &device_creator<kc_m036_device>;
+const device_type KC_M011 = device_creator<kc_m011_device>;
+const device_type KC_M022 = device_creator<kc_m022_device>;
+const device_type KC_M032 = device_creator<kc_m032_device>;
+const device_type KC_M034 = device_creator<kc_m034_device>;
+const device_type KC_M035 = device_creator<kc_m035_device>;
+const device_type KC_M036 = device_creator<kc_m036_device>;
//**************************************************************************
// M011 64KB RAM
diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp
index 6c2c4b85292..027b7347398 100644
--- a/src/devices/bus/kc/rom.cpp
+++ b/src/devices/bus/kc/rom.cpp
@@ -30,9 +30,9 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KC_STANDARD = &device_creator<kc_8k_device>;
-const device_type KC_M006 = &device_creator<kc_m006_device>;
-const device_type KC_M033 = &device_creator<kc_m033_device>;
+const device_type KC_STANDARD = device_creator<kc_8k_device>;
+const device_type KC_M006 = device_creator<kc_m006_device>;
+const device_type KC_M033 = device_creator<kc_m033_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp
index 49d216845b7..611965d0419 100644
--- a/src/devices/bus/lpci/cirrus.cpp
+++ b/src/devices/bus/lpci/cirrus.cpp
@@ -73,7 +73,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CIRRUS = &device_creator<cirrus_device>;
+const device_type CIRRUS = device_creator<cirrus_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp
index 23b3b81121d..80c711f5f13 100644
--- a/src/devices/bus/lpci/i82371ab.cpp
+++ b/src/devices/bus/lpci/i82371ab.cpp
@@ -19,7 +19,7 @@
#include "emu.h"
#include "i82371ab.h"
-const device_type I82371AB = &device_creator<i82371ab_device>;
+const device_type I82371AB = device_creator<i82371ab_device>;
i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp
index b57cea2bbd0..1193ed8d64e 100644
--- a/src/devices/bus/lpci/i82371sb.cpp
+++ b/src/devices/bus/lpci/i82371sb.cpp
@@ -24,7 +24,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type I82371SB = &device_creator<i82371sb_device>;
+const device_type I82371SB = device_creator<i82371sb_device>;
i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp
index 03abcef7b2c..568cba45c08 100644
--- a/src/devices/bus/lpci/i82439tx.cpp
+++ b/src/devices/bus/lpci/i82439tx.cpp
@@ -13,7 +13,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type I82439TX = &device_creator<i82439tx_device>;
+const device_type I82439TX = device_creator<i82439tx_device>;
i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp
index cbe94911a6b..45958b4196c 100644
--- a/src/devices/bus/lpci/mpc105.cpp
+++ b/src/devices/bus/lpci/mpc105.cpp
@@ -18,7 +18,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MPC105 = &device_creator<mpc105_device>;
+const device_type MPC105 = device_creator<mpc105_device>;
//**************************************************************************
diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp
index 710d04c35af..19e3d3ed63c 100644
--- a/src/devices/bus/lpci/pci.cpp
+++ b/src/devices/bus/lpci/pci.cpp
@@ -80,7 +80,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PCI_BUS = &device_creator<pci_bus_device>;
+const device_type PCI_BUS = device_creator<pci_bus_device>;
//**************************************************************************
// LIVE DEVICE
@@ -311,7 +311,7 @@ pci_device_interface::~pci_device_interface()
}
-const device_type PCI_CONNECTOR = &device_creator<pci_connector>;
+const device_type PCI_CONNECTOR = device_creator<pci_connector>;
pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index 1bc7de119e1..362f5053295 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -7,9 +7,11 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/i386/i386.h"
#include "southbridge.h"
+
#include "bus/pc_kbd/keyboards.h"
+#include "cpu/i386/i386.h"
+#include "speaker.h"
static SLOT_INTERFACE_START(pc_isa_onboard)
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index 3ea83ef84af..f5e78c1af9e 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
-#pragma once
+#ifndef MAME_BUS_LPCI_SOUTHBRIDGE_H
+#define MAME_BUS_LPCI_SOUTHBRIDGE_H
-#ifndef __SOUTHBRIDGE_H__
-#define __SOUTHBRIDGE_H__
+#pragma once
#include "machine/ins8250.h"
@@ -17,7 +17,7 @@
#include "imagedev/harddriv.h"
#include "pci.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "machine/ram.h"
#include "machine/nvram.h"
#include "bus/isa/isa.h"
@@ -126,4 +126,4 @@ protected:
void pc_select_dma_channel(int channel, bool state);
};
-#endif /* __SOUTHBRIDGE_H__ */
+#endif // MAME_BUS_LPCI_SOUTHBRIDGE_H
diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp
index a5adef41f5b..d6e2ea56302 100644
--- a/src/devices/bus/lpci/vt82c505.cpp
+++ b/src/devices/bus/lpci/vt82c505.cpp
@@ -14,7 +14,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type VT82C505 = &device_creator<vt82c505_device>;
+const device_type VT82C505 = device_creator<vt82c505_device>;
vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/m5/rom.cpp b/src/devices/bus/m5/rom.cpp
index 8d326e05d8b..7ca9a2400d1 100644
--- a/src/devices/bus/m5/rom.cpp
+++ b/src/devices/bus/m5/rom.cpp
@@ -17,8 +17,8 @@
// m5_rom_device - constructor
//-------------------------------------------------
-const device_type M5_ROM_STD = &device_creator<m5_rom_device>;
-const device_type M5_ROM_RAM = &device_creator<m5_ram_device>;
+const device_type M5_ROM_STD = device_creator<m5_rom_device>;
+const device_type M5_ROM_RAM = device_creator<m5_ram_device>;
m5_rom_device::m5_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp
index 9498e473322..3efed6adaf7 100644
--- a/src/devices/bus/m5/slot.cpp
+++ b/src/devices/bus/m5/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type M5_CART_SLOT = &device_creator<m5_cart_slot_device>;
+const device_type M5_CART_SLOT = device_creator<m5_cart_slot_device>;
//**************************************************************************
// M5 Cartridges Interface
diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp
index 7757c622cbb..b28f864bb80 100644
--- a/src/devices/bus/macpds/macpds.cpp
+++ b/src/devices/bus/macpds/macpds.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type MACPDS_SLOT = &device_creator<macpds_slot_device>;
+const device_type MACPDS_SLOT = device_creator<macpds_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -61,7 +61,7 @@ void macpds_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type MACPDS = &device_creator<macpds_device>;
+const device_type MACPDS = device_creator<macpds_device>;
void macpds_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp
index ed4d2259821..6b3260f74f5 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.cpp
+++ b/src/devices/bus/macpds/pds_tpdfpd.cpp
@@ -31,7 +31,10 @@
#include "emu.h"
#include "pds_tpdfpd.h"
+
#include "cpu/m68000/m68000.h"
+#include "screen.h"
+
#define SEDISPLAY_SCREEN_NAME "fpd_screen"
#define SEDISPLAY_ROM_REGION "fpd_rom"
@@ -56,7 +59,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS_SEDISPLAY = &device_creator<macpds_sedisplay_device>;
+const device_type PDS_SEDISPLAY = device_creator<macpds_sedisplay_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp
index 49132e537e4..128de4da279 100644
--- a/src/devices/bus/megadrive/eeprom.cpp
+++ b/src/devices/bus/megadrive/eeprom.cpp
@@ -51,13 +51,13 @@
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_STD_EEPROM = &device_creator<md_std_eeprom_device>;
-const device_type MD_EEPROM_NBAJAM = &device_creator<md_eeprom_nbajam_device>;
-const device_type MD_EEPROM_NBAJAMTE = &device_creator<md_eeprom_nbajamte_device>;
-const device_type MD_EEPROM_NFLQB = &device_creator<md_eeprom_nflqb_device>;
-const device_type MD_EEPROM_CSLAM = &device_creator<md_eeprom_cslam_device>;
-const device_type MD_EEPROM_NHLPA = &device_creator<md_eeprom_nhlpa_device>;
-const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>;
+const device_type MD_STD_EEPROM = device_creator<md_std_eeprom_device>;
+const device_type MD_EEPROM_NBAJAM = device_creator<md_eeprom_nbajam_device>;
+const device_type MD_EEPROM_NBAJAMTE = device_creator<md_eeprom_nbajamte_device>;
+const device_type MD_EEPROM_NFLQB = device_creator<md_eeprom_nflqb_device>;
+const device_type MD_EEPROM_CSLAM = device_creator<md_eeprom_cslam_device>;
+const device_type MD_EEPROM_NHLPA = device_creator<md_eeprom_nhlpa_device>;
+const device_type MD_EEPROM_BLARA = device_creator<md_eeprom_blara_device>;
md_std_eeprom_device::md_std_eeprom_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)
@@ -378,7 +378,7 @@ WRITE16_MEMBER(md_eeprom_blara_device::write)
// TEMPORARY ADDITION UNTIL WE FIND OUT WHAT IS MISSING IN THE CORE X24C02 CODE
// THIS IS A CUSTOM I2C EEPROM EMULATION THAT ALLOWS NBA JAM TO WORK
-const device_type MD_EEPROM_NBAJAM_ALT = &device_creator<md_eeprom_nbajam_device_alt>;
+const device_type MD_EEPROM_NBAJAM_ALT = device_creator<md_eeprom_nbajam_device_alt>;
md_eeprom_nbajam_device_alt::md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM_ALT, "MD NBA Jam (Alt)", tag, owner, clock, "md_eeprom_nbajama", __FILE__)
diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp
index a8586e087eb..0fa81aa1022 100644
--- a/src/devices/bus/megadrive/ggenie.cpp
+++ b/src/devices/bus/megadrive/ggenie.cpp
@@ -29,7 +29,7 @@
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>;
+const device_type MD_ROM_GAMEGENIE = device_creator<md_rom_ggenie_device>;
md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp
index 43d38e50a60..06ed2720eff 100644
--- a/src/devices/bus/megadrive/jcart.cpp
+++ b/src/devices/bus/megadrive/jcart.cpp
@@ -35,9 +35,9 @@
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_JCART = &device_creator<md_jcart_device>;
-const device_type MD_SEPROM_CODEMAST = &device_creator<md_seprom_codemast_device>;
-const device_type MD_SEPROM_MM96 = &device_creator<md_seprom_mm96_device>;
+const device_type MD_JCART = device_creator<md_jcart_device>;
+const device_type MD_SEPROM_CODEMAST = device_creator<md_seprom_codemast_device>;
+const device_type MD_SEPROM_MM96 = device_creator<md_seprom_mm96_device>;
// Sampras, Super Skidmarks?
md_jcart_device::md_jcart_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)
diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp
index b6d864002f5..b363b6222cc 100644
--- a/src/devices/bus/megadrive/md_slot.cpp
+++ b/src/devices/bus/megadrive/md_slot.cpp
@@ -51,9 +51,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type MD_CART_SLOT = &device_creator<md_cart_slot_device>;
-const device_type PICO_CART_SLOT = &device_creator<pico_cart_slot_device>;
-const device_type COPERA_CART_SLOT = &device_creator<copera_cart_slot_device>;
+const device_type MD_CART_SLOT = device_creator<md_cart_slot_device>;
+const device_type PICO_CART_SLOT = device_creator<pico_cart_slot_device>;
+const device_type COPERA_CART_SLOT = device_creator<copera_cart_slot_device>;
//**************************************************************************
// MD cartridges Interface
diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp
index 772a777d965..bb9e7c4fab0 100644
--- a/src/devices/bus/megadrive/rom.cpp
+++ b/src/devices/bus/megadrive/rom.cpp
@@ -24,45 +24,45 @@
//-------------------------------------------------
// BASE CARTS + NVRAM
-const device_type MD_STD_ROM = &device_creator<md_std_rom_device>;
-const device_type MD_ROM_SRAM = &device_creator<md_rom_sram_device>;
-const device_type MD_ROM_FRAM = &device_creator<md_rom_fram_device>;
+const device_type MD_STD_ROM = device_creator<md_std_rom_device>;
+const device_type MD_ROM_SRAM = device_creator<md_rom_sram_device>;
+const device_type MD_ROM_FRAM = device_creator<md_rom_fram_device>;
// BASE CARTS + BANKSWITCH AT RESET
-const device_type MD_ROM_CM2IN1 = &device_creator<md_rom_cm2in1_device>;
+const device_type MD_ROM_CM2IN1 = device_creator<md_rom_cm2in1_device>;
// BASE CARTS + PROTECTION / BANKSWITCH
-const device_type MD_ROM_SSF2 = &device_creator<md_rom_ssf2_device>;
-const device_type MD_ROM_BUGSLIFE = &device_creator<md_rom_bugslife_device>;
-const device_type MD_ROM_SMOUSE = &device_creator<md_rom_smouse_device>;
-const device_type MD_ROM_SMW64 = &device_creator<md_rom_smw64_device>;
-const device_type MD_ROM_SMB = &device_creator<md_rom_smb_device>;
-const device_type MD_ROM_SMB2 = &device_creator<md_rom_smb2_device>;
-const device_type MD_ROM_SBUBL = &device_creator<md_rom_sbubl_device>;
-const device_type MD_ROM_RX3 = &device_creator<md_rom_rx3_device>;
-const device_type MD_ROM_MJLOV = &device_creator<md_rom_mjlov_device>;
-const device_type MD_ROM_CJMJCLUB = &device_creator<md_rom_cjmjclub_device>;
-const device_type MD_ROM_KOF98 = &device_creator<md_rom_kof98_device>;
-const device_type MD_ROM_KOF99 = &device_creator<md_rom_kof99_device>;
-const device_type MD_ROM_SOULB = &device_creator<md_rom_soulb_device>;
-const device_type MD_ROM_CHINF3 = &device_creator<md_rom_chinf3_device>;
-const device_type MD_ROM_16MJ2 = &device_creator<md_rom_16mj2_device>;
-const device_type MD_ROM_ELFWOR = &device_creator<md_rom_elfwor_device>;
-const device_type MD_ROM_YASECH = &device_creator<md_rom_yasech_device>;
-const device_type MD_ROM_LION2 = &device_creator<md_rom_lion2_device>;
-const device_type MD_ROM_LION3 = &device_creator<md_rom_lion3_device>;
-const device_type MD_ROM_MCPIR = &device_creator<md_rom_mcpirate_device>;
-const device_type MD_ROM_POKEA = &device_creator<md_rom_pokea_device>;
-const device_type MD_ROM_POKESTAD = &device_creator<md_rom_pokestad_device>;
-const device_type MD_ROM_REALTEC = &device_creator<md_rom_realtec_device>;
-const device_type MD_ROM_REDCL = &device_creator<md_rom_redcl_device>;
-const device_type MD_ROM_SQUIR = &device_creator<md_rom_squir_device>;
-const device_type MD_ROM_TEKKENSP = &device_creator<md_rom_tekkensp_device>;
-const device_type MD_ROM_TOPF = &device_creator<md_rom_topf_device>;
-const device_type MD_ROM_RADICA = &device_creator<md_rom_radica_device>;
-const device_type MD_ROM_BEGGARP = &device_creator<md_rom_beggarp_device>;
-const device_type MD_ROM_WUKONG = &device_creator<md_rom_wukong_device>;
-const device_type MD_ROM_STARODYS = &device_creator<md_rom_starodys_device>;
+const device_type MD_ROM_SSF2 = device_creator<md_rom_ssf2_device>;
+const device_type MD_ROM_BUGSLIFE = device_creator<md_rom_bugslife_device>;
+const device_type MD_ROM_SMOUSE = device_creator<md_rom_smouse_device>;
+const device_type MD_ROM_SMW64 = device_creator<md_rom_smw64_device>;
+const device_type MD_ROM_SMB = device_creator<md_rom_smb_device>;
+const device_type MD_ROM_SMB2 = device_creator<md_rom_smb2_device>;
+const device_type MD_ROM_SBUBL = device_creator<md_rom_sbubl_device>;
+const device_type MD_ROM_RX3 = device_creator<md_rom_rx3_device>;
+const device_type MD_ROM_MJLOV = device_creator<md_rom_mjlov_device>;
+const device_type MD_ROM_CJMJCLUB = device_creator<md_rom_cjmjclub_device>;
+const device_type MD_ROM_KOF98 = device_creator<md_rom_kof98_device>;
+const device_type MD_ROM_KOF99 = device_creator<md_rom_kof99_device>;
+const device_type MD_ROM_SOULB = device_creator<md_rom_soulb_device>;
+const device_type MD_ROM_CHINF3 = device_creator<md_rom_chinf3_device>;
+const device_type MD_ROM_16MJ2 = device_creator<md_rom_16mj2_device>;
+const device_type MD_ROM_ELFWOR = device_creator<md_rom_elfwor_device>;
+const device_type MD_ROM_YASECH = device_creator<md_rom_yasech_device>;
+const device_type MD_ROM_LION2 = device_creator<md_rom_lion2_device>;
+const device_type MD_ROM_LION3 = device_creator<md_rom_lion3_device>;
+const device_type MD_ROM_MCPIR = device_creator<md_rom_mcpirate_device>;
+const device_type MD_ROM_POKEA = device_creator<md_rom_pokea_device>;
+const device_type MD_ROM_POKESTAD = device_creator<md_rom_pokestad_device>;
+const device_type MD_ROM_REALTEC = device_creator<md_rom_realtec_device>;
+const device_type MD_ROM_REDCL = device_creator<md_rom_redcl_device>;
+const device_type MD_ROM_SQUIR = device_creator<md_rom_squir_device>;
+const device_type MD_ROM_TEKKENSP = device_creator<md_rom_tekkensp_device>;
+const device_type MD_ROM_TOPF = device_creator<md_rom_topf_device>;
+const device_type MD_ROM_RADICA = device_creator<md_rom_radica_device>;
+const device_type MD_ROM_BEGGARP = device_creator<md_rom_beggarp_device>;
+const device_type MD_ROM_WUKONG = device_creator<md_rom_wukong_device>;
+const device_type MD_ROM_STARODYS = device_creator<md_rom_starodys_device>;
md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp
index 5703a2a96ca..8260ae4abf4 100644
--- a/src/devices/bus/megadrive/sk.cpp
+++ b/src/devices/bus/megadrive/sk.cpp
@@ -24,7 +24,7 @@
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_ROM_SK = &device_creator<md_rom_sk_device>;
+const device_type MD_ROM_SK = device_creator<md_rom_sk_device>;
md_rom_sk_device::md_rom_sk_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)
diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp
index dded370bdba..05adacac57f 100644
--- a/src/devices/bus/megadrive/stm95.cpp
+++ b/src/devices/bus/megadrive/stm95.cpp
@@ -172,7 +172,7 @@ void stm95_eeprom_device::set_sck_line(int state)
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>;
+const device_type MD_EEPROM_STM95 = device_creator<md_eeprom_stm95_device>;
md_eeprom_stm95_device::md_eeprom_stm95_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)
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index 8aa370164f2..05ac7f024a2 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -34,7 +34,7 @@
// md_rom_device - constructor
//-------------------------------------------------
-const device_type MD_ROM_SVP = &device_creator<md_rom_svp_device>;
+const device_type MD_ROM_SVP = device_creator<md_rom_svp_device>;
md_rom_svp_device::md_rom_svp_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/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp
index ea827d106d2..eb3cd8a2803 100644
--- a/src/devices/bus/midi/midi.cpp
+++ b/src/devices/bus/midi/midi.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "midi.h"
-const device_type MIDI_PORT = &device_creator<midi_port_device>;
+const device_type MIDI_PORT = device_creator<midi_port_device>;
midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__),
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index 745999faf79..4ad00742af1 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "midiinport.h"
-const device_type MIDIIN_PORT = &device_creator<midiin_port_device>;
+const device_type MIDIIN_PORT = device_creator<midiin_port_device>;
midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__),
diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp
index 78646ce3394..f9a37ee486d 100644
--- a/src/devices/bus/midi/midioutport.cpp
+++ b/src/devices/bus/midi/midioutport.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "midioutport.h"
-const device_type MIDIOUT_PORT = &device_creator<midiout_port_device>;
+const device_type MIDIOUT_PORT = device_creator<midiout_port_device>;
midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__),
diff --git a/src/devices/bus/msx_cart/arc.cpp b/src/devices/bus/msx_cart/arc.cpp
index 3aa7e52dcdd..b2e0395aadf 100644
--- a/src/devices/bus/msx_cart/arc.cpp
+++ b/src/devices/bus/msx_cart/arc.cpp
@@ -4,7 +4,7 @@
#include "arc.h"
-const device_type MSX_CART_ARC = &device_creator<msx_cart_arc>;
+const device_type MSX_CART_ARC = device_creator<msx_cart_arc>;
msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp
index dadc92e6606..9263ca01b72 100644
--- a/src/devices/bus/msx_cart/ascii.cpp
+++ b/src/devices/bus/msx_cart/ascii.cpp
@@ -4,11 +4,11 @@
#include "ascii.h"
-const device_type MSX_CART_ASCII8 = &device_creator<msx_cart_ascii8>;
-const device_type MSX_CART_ASCII16 = &device_creator<msx_cart_ascii16>;
-const device_type MSX_CART_ASCII8_SRAM = &device_creator<msx_cart_ascii8_sram>;
-const device_type MSX_CART_ASCII16_SRAM = &device_creator<msx_cart_ascii16_sram>;
-const device_type MSX_CART_MSXWRITE = &device_creator<msx_cart_msxwrite>;
+const device_type MSX_CART_ASCII8 = device_creator<msx_cart_ascii8>;
+const device_type MSX_CART_ASCII16 = device_creator<msx_cart_ascii16>;
+const device_type MSX_CART_ASCII8_SRAM = device_creator<msx_cart_ascii8_sram>;
+const device_type MSX_CART_ASCII16_SRAM = device_creator<msx_cart_ascii16_sram>;
+const device_type MSX_CART_MSXWRITE = device_creator<msx_cart_msxwrite>;
msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index 0ef22130923..77ddcd71a06 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -19,7 +19,7 @@ TODO:
#include "cpu/z80/z80.h"
-const device_type MSX_CART_BM_012 = &device_creator<msx_cart_bm_012>;
+const device_type MSX_CART_BM_012 = device_creator<msx_cart_bm_012>;
msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/crossblaim.cpp b/src/devices/bus/msx_cart/crossblaim.cpp
index 99f081e1eb0..97e875c5432 100644
--- a/src/devices/bus/msx_cart/crossblaim.cpp
+++ b/src/devices/bus/msx_cart/crossblaim.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "crossblaim.h"
-const device_type MSX_CART_CROSSBLAIM = &device_creator<msx_cart_crossblaim>;
+const device_type MSX_CART_CROSSBLAIM = device_creator<msx_cart_crossblaim>;
msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index e025ae73ce2..2355f8959ca 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -105,10 +105,10 @@
#include "formats/msx_dsk.h"
#include "softlist.h"
-const device_type MSX_CART_VY0010 = &device_creator<msx_cart_vy0010>;
-const device_type MSX_CART_FSFD1 = &device_creator<msx_cart_fsfd1>;
-const device_type MSX_CART_FSFD1A = &device_creator<msx_cart_fsfd1a>;
-const device_type MSX_CART_FSCF351 = &device_creator<msx_cart_fscf351>;
+const device_type MSX_CART_VY0010 = device_creator<msx_cart_vy0010>;
+const device_type MSX_CART_FSFD1 = device_creator<msx_cart_fsfd1>;
+const device_type MSX_CART_FSFD1A = device_creator<msx_cart_fsfd1a>;
+const device_type MSX_CART_FSCF351 = device_creator<msx_cart_fscf351>;
FLOPPY_FORMATS_MEMBER( msx_cart_disk::floppy_formats )
diff --git a/src/devices/bus/msx_cart/dooly.cpp b/src/devices/bus/msx_cart/dooly.cpp
index 494e1bf7207..05a29131cea 100644
--- a/src/devices/bus/msx_cart/dooly.cpp
+++ b/src/devices/bus/msx_cart/dooly.cpp
@@ -4,7 +4,7 @@
#include "dooly.h"
-const device_type MSX_CART_DOOLY = &device_creator<msx_cart_dooly>;
+const device_type MSX_CART_DOOLY = device_creator<msx_cart_dooly>;
msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 0654c27b1fe..3eb388ddb8e 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -9,8 +9,9 @@ with: PAC2 BACKUP DATA. We only store the raw sram contents.
#include "emu.h"
#include "fmpac.h"
+#include "speaker.h"
-const device_type MSX_CART_FMPAC = &device_creator<msx_cart_fmpac>;
+const device_type MSX_CART_FMPAC = device_creator<msx_cart_fmpac>;
msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/fs_sr022.cpp b/src/devices/bus/msx_cart/fs_sr022.cpp
index efea17e4153..6b7cb69c17a 100644
--- a/src/devices/bus/msx_cart/fs_sr022.cpp
+++ b/src/devices/bus/msx_cart/fs_sr022.cpp
@@ -4,7 +4,7 @@
#include "fs_sr022.h"
-const device_type MSX_CART_FS_SR022 = &device_creator<msx_cart_fs_sr022>;
+const device_type MSX_CART_FS_SR022 = device_creator<msx_cart_fs_sr022>;
msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/halnote.cpp b/src/devices/bus/msx_cart/halnote.cpp
index 13b85a3cf77..a4a25378d6e 100644
--- a/src/devices/bus/msx_cart/halnote.cpp
+++ b/src/devices/bus/msx_cart/halnote.cpp
@@ -4,7 +4,7 @@
#include "halnote.h"
-const device_type MSX_CART_HALNOTE = &device_creator<msx_cart_halnote>;
+const device_type MSX_CART_HALNOTE = device_creator<msx_cart_halnote>;
msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/hfox.cpp b/src/devices/bus/msx_cart/hfox.cpp
index e5879cee778..fa8ea7b8870 100644
--- a/src/devices/bus/msx_cart/hfox.cpp
+++ b/src/devices/bus/msx_cart/hfox.cpp
@@ -4,7 +4,7 @@
#include "hfox.h"
-const device_type MSX_CART_HFOX = &device_creator<msx_cart_hfox>;
+const device_type MSX_CART_HFOX = device_creator<msx_cart_hfox>;
msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp
index 3c5ae04dc0c..94373c6019a 100644
--- a/src/devices/bus/msx_cart/holy_quran.cpp
+++ b/src/devices/bus/msx_cart/holy_quran.cpp
@@ -4,7 +4,7 @@
#include "holy_quran.h"
-const device_type MSX_CART_HOLY_QURAN = &device_creator<msx_cart_holy_quran>;
+const device_type MSX_CART_HOLY_QURAN = device_creator<msx_cart_holy_quran>;
msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index f30685bf01f..b082e5c9703 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -2,15 +2,18 @@
// copyright-holders:Wilbert Pol
#include "emu.h"
#include "konami.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
-const device_type MSX_CART_KONAMI = &device_creator<msx_cart_konami>;
-const device_type MSX_CART_KONAMI_SCC = &device_creator<msx_cart_konami_scc>;
-const device_type MSX_CART_GAMEMASTER2 = &device_creator<msx_cart_gamemaster2>;
-const device_type MSX_CART_SYNTHESIZER = &device_creator<msx_cart_synthesizer>;
-const device_type MSX_CART_SOUND_SNATCHER = &device_creator<msx_cart_konami_sound_snatcher>;
-const device_type MSX_CART_SOUND_SDSNATCHER = &device_creator<msx_cart_konami_sound_sdsnatcher>;
-const device_type MSX_CART_KEYBOARD_MASTER = &device_creator<msx_cart_keyboard_master>;
+const device_type MSX_CART_KONAMI = device_creator<msx_cart_konami>;
+const device_type MSX_CART_KONAMI_SCC = device_creator<msx_cart_konami_scc>;
+const device_type MSX_CART_GAMEMASTER2 = device_creator<msx_cart_gamemaster2>;
+const device_type MSX_CART_SYNTHESIZER = device_creator<msx_cart_synthesizer>;
+const device_type MSX_CART_SOUND_SNATCHER = device_creator<msx_cart_konami_sound_snatcher>;
+const device_type MSX_CART_SOUND_SDSNATCHER = device_creator<msx_cart_konami_sound_sdsnatcher>;
+const device_type MSX_CART_KEYBOARD_MASTER = device_creator<msx_cart_keyboard_master>;
msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/korean.cpp b/src/devices/bus/msx_cart/korean.cpp
index 7f97f4bb49f..8ea5b5cfac3 100644
--- a/src/devices/bus/msx_cart/korean.cpp
+++ b/src/devices/bus/msx_cart/korean.cpp
@@ -3,9 +3,9 @@
#include "emu.h"
#include "korean.h"
-const device_type MSX_CART_KOREAN_80IN1 = &device_creator<msx_cart_korean_80in1>;
-const device_type MSX_CART_KOREAN_90IN1 = &device_creator<msx_cart_korean_90in1>;
-const device_type MSX_CART_KOREAN_126IN1 = &device_creator<msx_cart_korean_126in1>;
+const device_type MSX_CART_KOREAN_80IN1 = device_creator<msx_cart_korean_80in1>;
+const device_type MSX_CART_KOREAN_90IN1 = device_creator<msx_cart_korean_90in1>;
+const device_type MSX_CART_KOREAN_126IN1 = device_creator<msx_cart_korean_126in1>;
msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp
index d81d79b95ec..8617860431d 100644
--- a/src/devices/bus/msx_cart/majutsushi.cpp
+++ b/src/devices/bus/msx_cart/majutsushi.cpp
@@ -2,9 +2,12 @@
// copyright-holders:Wilbert Pol
#include "emu.h"
#include "majutsushi.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
-const device_type MSX_CART_MAJUTSUSHI = &device_creator<msx_cart_majutsushi>;
+const device_type MSX_CART_MAJUTSUSHI = device_creator<msx_cart_majutsushi>;
msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp
index 8596bfce530..95a212ebb67 100644
--- a/src/devices/bus/msx_cart/moonsound.cpp
+++ b/src/devices/bus/msx_cart/moonsound.cpp
@@ -11,12 +11,14 @@ TODO:
#include "emu.h"
#include "moonsound.h"
+#include "speaker.h"
+
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type MSX_CART_MOONSOUND = &device_creator<msx_cart_moonsound>;
+const device_type MSX_CART_MOONSOUND = device_creator<msx_cart_moonsound>;
msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index aa96a165f89..19a48299e7c 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -64,10 +64,12 @@ and/or http://ngs.no.coocan.jp/doc/wiki.cgi/datapack?page=4.2+MSX-AUDIO+%B3%C8%C
#include "msx_audio.h"
#include "bus/msx_cart/msx_audio_kb.h"
+#include "speaker.h"
-const device_type MSX_CART_MSX_AUDIO_HXMU900 = &device_creator<msx_cart_msx_audio_hxmu900>;
-const device_type MSX_CART_MSX_AUDIO_NMS1205 = &device_creator<msx_cart_msx_audio_nms1205>;
-const device_type MSX_CART_MSX_AUDIO_FSCA1 = &device_creator<msx_cart_msx_audio_fsca1>;
+
+const device_type MSX_CART_MSX_AUDIO_HXMU900 = device_creator<msx_cart_msx_audio_hxmu900>;
+const device_type MSX_CART_MSX_AUDIO_NMS1205 = device_creator<msx_cart_msx_audio_nms1205>;
+const device_type MSX_CART_MSX_AUDIO_FSCA1 = device_creator<msx_cart_msx_audio_fsca1>;
msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp
index 2b0fd16f725..e606e0ffae9 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.cpp
+++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp
@@ -4,7 +4,7 @@
#include "msx_audio_kb.h"
-const device_type MSX_AUDIO_KBDC_PORT = &device_creator<msx_audio_kbdc_port_device>;
+const device_type MSX_AUDIO_KBDC_PORT = device_creator<msx_audio_kbdc_port_device>;
msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@@ -305,8 +305,8 @@ ioport_constructor msx_nms1160::device_input_ports() const
-const device_type MSX_AUDIO_KB_HXMU901 = &device_creator<msx_hxmu901>;
-const device_type MSX_AUDIO_KB_NMS1160 = &device_creator<msx_nms1160>;
+const device_type MSX_AUDIO_KB_HXMU901 = device_creator<msx_hxmu901>;
+const device_type MSX_AUDIO_KB_NMS1160 = device_creator<msx_nms1160>;
SLOT_INTERFACE_START( msx_audio_keyboards )
diff --git a/src/devices/bus/msx_cart/msxdos2.cpp b/src/devices/bus/msx_cart/msxdos2.cpp
index 3396ee67221..3fac4457d63 100644
--- a/src/devices/bus/msx_cart/msxdos2.cpp
+++ b/src/devices/bus/msx_cart/msxdos2.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "msxdos2.h"
-const device_type MSX_CART_MSXDOS2 = &device_creator<msx_cart_msxdos2>;
+const device_type MSX_CART_MSXDOS2 = device_creator<msx_cart_msxdos2>;
msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/nomapper.cpp b/src/devices/bus/msx_cart/nomapper.cpp
index 2b9b756e628..32c49517fa9 100644
--- a/src/devices/bus/msx_cart/nomapper.cpp
+++ b/src/devices/bus/msx_cart/nomapper.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "nomapper.h"
-const device_type MSX_CART_NOMAPPER = &device_creator<msx_cart_nomapper>;
+const device_type MSX_CART_NOMAPPER = device_creator<msx_cart_nomapper>;
msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/rtype.cpp b/src/devices/bus/msx_cart/rtype.cpp
index d45dbac407b..d6c432a7dd4 100644
--- a/src/devices/bus/msx_cart/rtype.cpp
+++ b/src/devices/bus/msx_cart/rtype.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "rtype.h"
-const device_type MSX_CART_RTYPE = &device_creator<msx_cart_rtype>;
+const device_type MSX_CART_RTYPE = device_creator<msx_cart_rtype>;
msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/super_swangi.cpp b/src/devices/bus/msx_cart/super_swangi.cpp
index c020e1f311f..8983b57e429 100644
--- a/src/devices/bus/msx_cart/super_swangi.cpp
+++ b/src/devices/bus/msx_cart/super_swangi.cpp
@@ -4,7 +4,7 @@
#include "super_swangi.h"
-const device_type MSX_CART_SUPER_SWANGI = &device_creator<msx_cart_super_swangi>;
+const device_type MSX_CART_SUPER_SWANGI = device_creator<msx_cart_super_swangi>;
msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/superloderunner.cpp b/src/devices/bus/msx_cart/superloderunner.cpp
index c738d19ebbb..64fd457377a 100644
--- a/src/devices/bus/msx_cart/superloderunner.cpp
+++ b/src/devices/bus/msx_cart/superloderunner.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "superloderunner.h"
-const device_type MSX_CART_SUPERLODERUNNER = &device_creator<msx_cart_superloderunner>;
+const device_type MSX_CART_SUPERLODERUNNER = device_creator<msx_cart_superloderunner>;
msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index f3f2bfb3815..dff91b2ce54 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -11,11 +11,13 @@ TODO:
#include "emu.h"
#include "yamaha.h"
+
#include "bus/midi/midi.h"
+#include "speaker.h"
-const device_type MSX_CART_SFG01 = &device_creator<msx_cart_sfg01>;
-const device_type MSX_CART_SFG05 = &device_creator<msx_cart_sfg05>;
+const device_type MSX_CART_SFG01 = device_creator<msx_cart_sfg01>;
+const device_type MSX_CART_SFG05 = device_creator<msx_cart_sfg05>;
msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
diff --git a/src/devices/bus/msx_slot/bunsetsu.cpp b/src/devices/bus/msx_slot/bunsetsu.cpp
index ce144821213..99da86b1a9a 100644
--- a/src/devices/bus/msx_slot/bunsetsu.cpp
+++ b/src/devices/bus/msx_slot/bunsetsu.cpp
@@ -8,7 +8,7 @@
#include "bunsetsu.h"
-const device_type MSX_SLOT_BUNSETSU = &device_creator<msx_slot_bunsetsu_device>;
+const device_type MSX_SLOT_BUNSETSU = device_creator<msx_slot_bunsetsu_device>;
msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp
index 0727dce6151..9e929f44046 100644
--- a/src/devices/bus/msx_slot/cartridge.cpp
+++ b/src/devices/bus/msx_slot/cartridge.cpp
@@ -29,8 +29,8 @@ enum
};
-const device_type MSX_SLOT_CARTRIDGE = &device_creator<msx_slot_cartridge_device>;
-const device_type MSX_SLOT_YAMAHA_EXPANSION = &device_creator<msx_slot_yamaha_expansion_device>;
+const device_type MSX_SLOT_CARTRIDGE = device_creator<msx_slot_cartridge_device>;
+const device_type MSX_SLOT_YAMAHA_EXPANSION = device_creator<msx_slot_yamaha_expansion_device>;
msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp
index f2110a16791..7e3e0370ef1 100644
--- a/src/devices/bus/msx_slot/disk.cpp
+++ b/src/devices/bus/msx_slot/disk.cpp
@@ -35,12 +35,12 @@ set on 7FFDH bit 2 always to 0 (some use it as disk change reset)
#include "disk.h"
-const device_type MSX_SLOT_DISK1 = &device_creator<msx_slot_disk1_device>;
-const device_type MSX_SLOT_DISK2 = &device_creator<msx_slot_disk2_device>;
-const device_type MSX_SLOT_DISK3 = &device_creator<msx_slot_disk3_device>;
-const device_type MSX_SLOT_DISK4 = &device_creator<msx_slot_disk4_device>;
-const device_type MSX_SLOT_DISK5 = &device_creator<msx_slot_disk5_device>;
-const device_type MSX_SLOT_DISK6 = &device_creator<msx_slot_disk6_device>;
+const device_type MSX_SLOT_DISK1 = device_creator<msx_slot_disk1_device>;
+const device_type MSX_SLOT_DISK2 = device_creator<msx_slot_disk2_device>;
+const device_type MSX_SLOT_DISK3 = device_creator<msx_slot_disk3_device>;
+const device_type MSX_SLOT_DISK4 = device_creator<msx_slot_disk4_device>;
+const device_type MSX_SLOT_DISK5 = device_creator<msx_slot_disk5_device>;
+const device_type MSX_SLOT_DISK6 = device_creator<msx_slot_disk6_device>;
msx_slot_disk_device::msx_slot_disk_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)
diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp
index 0b452695bf5..0b15cb77048 100644
--- a/src/devices/bus/msx_slot/fs4600.cpp
+++ b/src/devices/bus/msx_slot/fs4600.cpp
@@ -8,7 +8,7 @@
#include "fs4600.h"
-const device_type MSX_SLOT_FS4600 = &device_creator<msx_slot_fs4600_device>;
+const device_type MSX_SLOT_FS4600 = device_creator<msx_slot_fs4600_device>;
msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/music.cpp b/src/devices/bus/msx_slot/music.cpp
index 26173425866..ae11b71df2b 100644
--- a/src/devices/bus/msx_slot/music.cpp
+++ b/src/devices/bus/msx_slot/music.cpp
@@ -4,7 +4,7 @@
#include "music.h"
-const device_type MSX_SLOT_MUSIC = &device_creator<msx_slot_music_device>;
+const device_type MSX_SLOT_MUSIC = device_creator<msx_slot_music_device>;
msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp
index ce861c3e7da..b1f30ca70cc 100644
--- a/src/devices/bus/msx_slot/panasonic08.cpp
+++ b/src/devices/bus/msx_slot/panasonic08.cpp
@@ -13,7 +13,7 @@ Todo:
#include "panasonic08.h"
-const device_type MSX_SLOT_PANASONIC08 = &device_creator<msx_slot_panasonic08_device>;
+const device_type MSX_SLOT_PANASONIC08 = device_creator<msx_slot_panasonic08_device>;
msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/ram.cpp b/src/devices/bus/msx_slot/ram.cpp
index 85b645b448d..e03a8ed4e7c 100644
--- a/src/devices/bus/msx_slot/ram.cpp
+++ b/src/devices/bus/msx_slot/ram.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "ram.h"
-const device_type MSX_SLOT_RAM = &device_creator<msx_slot_ram_device>;
+const device_type MSX_SLOT_RAM = device_creator<msx_slot_ram_device>;
msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_RAM, "MSX Internal RAM", tag, owner, clock, "msx_slot_ram", __FILE__)
diff --git a/src/devices/bus/msx_slot/ram_mm.cpp b/src/devices/bus/msx_slot/ram_mm.cpp
index 86078ca280f..75ea33d06c5 100644
--- a/src/devices/bus/msx_slot/ram_mm.cpp
+++ b/src/devices/bus/msx_slot/ram_mm.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "ram_mm.h"
-const device_type MSX_SLOT_RAM_MM = &device_creator<msx_slot_ram_mm_device>;
+const device_type MSX_SLOT_RAM_MM = device_creator<msx_slot_ram_mm_device>;
msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_RAM_MM, "MSX Internal Memory Mapped RAM", tag, owner, clock, "msx_slot_ram_mm", __FILE__)
diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp
index 85c9930cfc7..46d468b8121 100644
--- a/src/devices/bus/msx_slot/rom.cpp
+++ b/src/devices/bus/msx_slot/rom.cpp
@@ -4,7 +4,7 @@
#include "rom.h"
-const device_type MSX_SLOT_ROM = &device_creator<msx_slot_rom_device>;
+const device_type MSX_SLOT_ROM = device_creator<msx_slot_rom_device>;
msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp
index 61b6b836f13..4c575c9f94d 100644
--- a/src/devices/bus/msx_slot/sony08.cpp
+++ b/src/devices/bus/msx_slot/sony08.cpp
@@ -10,7 +10,7 @@
#include "sony08.h"
-const device_type MSX_SLOT_SONY08 = &device_creator<msx_slot_sony08_device>;
+const device_type MSX_SLOT_SONY08 = device_creator<msx_slot_sony08_device>;
msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index 7203420fdf8..4c7b95abdc9 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -9,12 +9,14 @@
#include "emu.h"
#include "avc.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NASCOM_AVC = &device_creator<nascom_avc_device>;
+const device_type NASCOM_AVC = device_creator<nascom_avc_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index 2f832b27b3a..d61180e0216 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NASCOM_FDC = &device_creator<nascom_fdc_device>;
+const device_type NASCOM_FDC = device_creator<nascom_fdc_device>;
FLOPPY_FORMATS_MEMBER( nascom_fdc_device::floppy_formats )
FLOPPY_NASCOM_FORMAT
diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp
index 32fef766f81..414d14bf27e 100644
--- a/src/devices/bus/nasbus/nasbus.cpp
+++ b/src/devices/bus/nasbus/nasbus.cpp
@@ -16,7 +16,7 @@
// NASBUS SLOT DEVICE
//**************************************************************************
-const device_type NASBUS_SLOT = &device_creator<nasbus_slot_device>;
+const device_type NASBUS_SLOT = device_creator<nasbus_slot_device>;
//-------------------------------------------------
// nasbus_slot_device - constructor
@@ -64,7 +64,7 @@ void nasbus_slot_device::device_start()
// NASBUS DEVICE
//**************************************************************************
-const device_type NASBUS = &device_creator<nasbus_device>;
+const device_type NASBUS = device_creator<nasbus_device>;
//-------------------------------------------------
// nasbus_device - constructor
diff --git a/src/devices/bus/neogeo/boot_cthd.cpp b/src/devices/bus/neogeo/boot_cthd.cpp
index af8f38ec254..79189841fdf 100644
--- a/src/devices/bus/neogeo/boot_cthd.cpp
+++ b/src/devices/bus/neogeo/boot_cthd.cpp
@@ -16,7 +16,7 @@
// neogeo_cthd2k3_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_CTHD2K3_CART = &device_creator<neogeo_cthd2k3_cart>;
+const device_type NEOGEO_CTHD2K3_CART = device_creator<neogeo_cthd2k3_cart>;
neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -74,7 +74,7 @@ void neogeo_cthd2k3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
**************************************************/
-const device_type NEOGEO_CT2K3SP_CART = &device_creator<neogeo_ct2k3sp_cart>;
+const device_type NEOGEO_CT2K3SP_CART = device_creator<neogeo_ct2k3sp_cart>;
neogeo_ct2k3sp_cart::neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SP_CART, "Neo Geo CTHD 2003 Sp Cart", tag, owner, clock, "neocart_ct2k3sp", __FILE__)
@@ -90,7 +90,7 @@ void neogeo_ct2k3sp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
ct2k3sa
**************************************************/
-const device_type NEOGEO_CT2K3SA_CART = &device_creator<neogeo_ct2k3sa_cart>;
+const device_type NEOGEO_CT2K3SA_CART = device_creator<neogeo_ct2k3sa_cart>;
neogeo_ct2k3sa_cart::neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SA_CART, "Neo Geo CTHD 2003 Sp Alt Cart", tag, owner, clock, "neocart_ct2k3sa", __FILE__)
@@ -107,7 +107,7 @@ void neogeo_ct2k3sa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
matrimbl
**************************************************/
-const device_type NEOGEO_MATRIMBL_CART = &device_creator<neogeo_matrimbl_cart>;
+const device_type NEOGEO_MATRIMBL_CART = device_creator<neogeo_matrimbl_cart>;
neogeo_matrimbl_cart::neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_MATRIMBL_CART, "Neo Geo Matrimelee Bootleg Cart", tag, owner, clock, "neocart_matrimbl", __FILE__),
diff --git a/src/devices/bus/neogeo/boot_kof10th.cpp b/src/devices/bus/neogeo/boot_kof10th.cpp
index 5420fbd52a9..1ce38f14785 100644
--- a/src/devices/bus/neogeo/boot_kof10th.cpp
+++ b/src/devices/bus/neogeo/boot_kof10th.cpp
@@ -16,7 +16,7 @@
// neogeo_kof10th_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_KOF10TH_CART = &device_creator<neogeo_kof10th_cart>;
+const device_type NEOGEO_KOF10TH_CART = device_creator<neogeo_kof10th_cart>;
neogeo_kof10th_cart::neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
diff --git a/src/devices/bus/neogeo/boot_kof2k2.cpp b/src/devices/bus/neogeo/boot_kof2k2.cpp
index eff560a3bc2..522f83e65aa 100644
--- a/src/devices/bus/neogeo/boot_kof2k2.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k2.cpp
@@ -44,7 +44,7 @@ machine_config_constructor neogeo_kf2k2mp2_cart::device_mconfig_additions() cons
kof2002b
**************************************************/
-const device_type NEOGEO_KOF2002B_CART = &device_creator<neogeo_kof2002b_cart>;
+const device_type NEOGEO_KOF2002B_CART = device_creator<neogeo_kof2002b_cart>;
neogeo_kof2002b_cart::neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOF2002B_CART, "Neo Geo KOF 2002 Bootleg Cart", tag, owner, clock, "neocart_kof2002b", __FILE__),
@@ -67,7 +67,7 @@ void neogeo_kof2002b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k2mp
**************************************************/
-const device_type NEOGEO_KF2K2MP_CART = &device_creator<neogeo_kf2k2mp_cart>;
+const device_type NEOGEO_KF2K2MP_CART = device_creator<neogeo_kf2k2mp_cart>;
neogeo_kf2k2mp_cart::neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP_CART, "Neo Geo KOF 2002 MP Cart", tag, owner, clock, "neocart_kf2k2mp", __FILE__),
@@ -89,7 +89,7 @@ void neogeo_kf2k2mp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k2mp2
**************************************************/
-const device_type NEOGEO_KF2K2MP2_CART = &device_creator<neogeo_kf2k2mp2_cart>;
+const device_type NEOGEO_KF2K2MP2_CART = device_creator<neogeo_kf2k2mp2_cart>;
neogeo_kf2k2mp2_cart::neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP2_CART, "Neo Geo KOF 2002 MP2 Cart", tag, owner, clock, "neocart_kf2k2mp2", __FILE__),
diff --git a/src/devices/bus/neogeo/boot_kof2k3.cpp b/src/devices/bus/neogeo/boot_kof2k3.cpp
index 25b3560c45f..b5394a3a652 100644
--- a/src/devices/bus/neogeo/boot_kof2k3.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k3.cpp
@@ -38,7 +38,7 @@ machine_config_constructor neogeo_kf2k3upl_cart::device_mconfig_additions() cons
kf2k3bl
**************************************************/
-const device_type NEOGEO_KF2K3BL_CART = &device_creator<neogeo_kf2k3bl_cart>;
+const device_type NEOGEO_KF2K3BL_CART = device_creator<neogeo_kf2k3bl_cart>;
neogeo_kf2k3bl_cart::neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3BL_CART, "Neo Geo KOF 2003 Bootleg Cart", tag, owner, clock, "neocart_kf2k3bl", __FILE__),
@@ -59,7 +59,7 @@ void neogeo_kf2k3bl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k3pl
**************************************************/
-const device_type NEOGEO_KF2K3PL_CART = &device_creator<neogeo_kf2k3pl_cart>;
+const device_type NEOGEO_KF2K3PL_CART = device_creator<neogeo_kf2k3pl_cart>;
neogeo_kf2k3pl_cart::neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3PL_CART, "Neo Geo KOF 2003 PL Cart", tag, owner, clock, "neocart_kf2k3pl", __FILE__),
@@ -81,7 +81,7 @@ void neogeo_kf2k3pl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k3upl
**************************************************/
-const device_type NEOGEO_KF2K3UPL_CART = &device_creator<neogeo_kf2k3upl_cart>;
+const device_type NEOGEO_KF2K3UPL_CART = device_creator<neogeo_kf2k3upl_cart>;
neogeo_kf2k3upl_cart::neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3UPL_CART, "Neo Geo KOF 2003 UPL Cart", tag, owner, clock, "neocart_kf2k3upl", __FILE__),
diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp
index 082d011d9ac..4740d770729 100644
--- a/src/devices/bus/neogeo/boot_misc.cpp
+++ b/src/devices/bus/neogeo/boot_misc.cpp
@@ -16,7 +16,7 @@
// neogeo_bootleg_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_BOOTLEG_CART = &device_creator<neogeo_bootleg_cart>;
+const device_type NEOGEO_BOOTLEG_CART = device_creator<neogeo_bootleg_cart>;
neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -62,7 +62,7 @@ machine_config_constructor neogeo_bootleg_cart::device_mconfig_additions() const
garoubl
**************************************************/
-const device_type NEOGEO_GAROUBL_CART = &device_creator<neogeo_garoubl_cart>;
+const device_type NEOGEO_GAROUBL_CART = device_creator<neogeo_garoubl_cart>;
neogeo_garoubl_cart::neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_GAROUBL_CART, "Neo Geo Garou Bootleg Cart", tag, owner, clock, "neocart_garoubl", __FILE__)
@@ -80,7 +80,7 @@ void neogeo_garoubl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof97oro
**************************************************/
-const device_type NEOGEO_KOF97ORO_CART = &device_creator<neogeo_kof97oro_cart>;
+const device_type NEOGEO_KOF97ORO_CART = device_creator<neogeo_kof97oro_cart>;
neogeo_kof97oro_cart::neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOF97ORO_CART, "Neo Geo KOF 97 Orochi Bootleg Cart", tag, owner, clock, "neocart_kof97oro", __FILE__)
@@ -99,7 +99,7 @@ void neogeo_kof97oro_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf10thep
**************************************************/
-const device_type NEOGEO_KF10THEP_CART = &device_creator<neogeo_kf10thep_cart>;
+const device_type NEOGEO_KF10THEP_CART = device_creator<neogeo_kf10thep_cart>;
neogeo_kf10thep_cart::neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF10THEP_CART, "Neo Geo KOF 10th Ann. EP Bootleg Cart", tag, owner, clock, "neocart_kf10thep", __FILE__)
@@ -117,7 +117,7 @@ void neogeo_kf10thep_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k5uni
**************************************************/
-const device_type NEOGEO_KF2K5UNI_CART = &device_creator<neogeo_kf2k5uni_cart>;
+const device_type NEOGEO_KF2K5UNI_CART = device_creator<neogeo_kf2k5uni_cart>;
neogeo_kf2k5uni_cart::neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K5UNI_CART, "Neo Geo KOF 2005 Unique Bootleg Cart", tag, owner, clock, "neocart_kf2k5uni", __FILE__)
@@ -136,7 +136,7 @@ void neogeo_kf2k5uni_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kf2k4se
**************************************************/
-const device_type NEOGEO_KF2K4SE_CART = &device_creator<neogeo_kf2k4se_cart>;
+const device_type NEOGEO_KF2K4SE_CART = device_creator<neogeo_kf2k4se_cart>;
neogeo_kf2k4se_cart::neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K4SE_CART, "Neo Geo KOF 2004 SE Bootleg Cart", tag, owner, clock, "neocart_kf2k4se", __FILE__)
@@ -153,7 +153,7 @@ void neogeo_kf2k4se_cart::decrypt_all(DECRYPT_ALL_PARAMS)
lans2004
**************************************************/
-const device_type NEOGEO_LANS2004_CART = &device_creator<neogeo_lans2004_cart>;
+const device_type NEOGEO_LANS2004_CART = device_creator<neogeo_lans2004_cart>;
neogeo_lans2004_cart::neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_LANS2004_CART, "Neo Geo Lansquenet 2004 Bootleg Cart", tag, owner, clock, "neocart_lans2004", __FILE__)
@@ -172,7 +172,7 @@ void neogeo_lans2004_cart::decrypt_all(DECRYPT_ALL_PARAMS)
samsho5b
**************************************************/
-const device_type NEOGEO_SAMSHO5B_CART = &device_creator<neogeo_samsho5b_cart>;
+const device_type NEOGEO_SAMSHO5B_CART = device_creator<neogeo_samsho5b_cart>;
neogeo_samsho5b_cart::neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SAMSHO5B_CART, "Neo Geo Samurai Shodown 5 Bootleg Cart", tag, owner, clock, "neocart_samsho5b", __FILE__)
@@ -191,7 +191,7 @@ void neogeo_samsho5b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
mslug3b6
**************************************************/
-const device_type NEOGEO_MSLUG3B6_CART = &device_creator<neogeo_mslug3b6_cart>;
+const device_type NEOGEO_MSLUG3B6_CART = device_creator<neogeo_mslug3b6_cart>;
neogeo_mslug3b6_cart::neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_MSLUG3B6_CART, "Neo Geo Metal Slug 6 Bootleg Cart", tag, owner, clock, "neocart_mslug3b6", __FILE__),
@@ -219,7 +219,7 @@ machine_config_constructor neogeo_mslug3b6_cart::device_mconfig_additions() cons
ms5plus
**************************************************/
-const device_type NEOGEO_MS5PLUS_CART = &device_creator<neogeo_ms5plus_cart>;
+const device_type NEOGEO_MS5PLUS_CART = device_creator<neogeo_ms5plus_cart>;
neogeo_ms5plus_cart::neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_MS5PLUS_CART, "Neo Geo Metal Slug 5 Plus Bootleg Cart", tag, owner, clock, "neocart_ms5plus", __FILE__),
@@ -251,7 +251,7 @@ machine_config_constructor neogeo_ms5plus_cart::device_mconfig_additions() const
kog
**************************************************/
-const device_type NEOGEO_KOG_CART = &device_creator<neogeo_kog_cart>;
+const device_type NEOGEO_KOG_CART = device_creator<neogeo_kog_cart>;
neogeo_kog_cart::neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOG_CART, "Neo Geo King of Gladiators Bootleg Cart", tag, owner, clock, "neocart_kog", __FILE__),
diff --git a/src/devices/bus/neogeo/boot_svc.cpp b/src/devices/bus/neogeo/boot_svc.cpp
index 869bcea516d..9f9a9fdce35 100644
--- a/src/devices/bus/neogeo/boot_svc.cpp
+++ b/src/devices/bus/neogeo/boot_svc.cpp
@@ -16,7 +16,7 @@
svcboot
**************************************************/
-const device_type NEOGEO_SVCBOOT_CART = &device_creator<neogeo_svcboot_cart>;
+const device_type NEOGEO_SVCBOOT_CART = device_creator<neogeo_svcboot_cart>;
neogeo_svcboot_cart::neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCBOOT_CART, "Neo Geo SVC Bootleg Cart", tag, owner, clock, "neocart_svcboot", __FILE__),
@@ -44,7 +44,7 @@ machine_config_constructor neogeo_svcboot_cart::device_mconfig_additions() const
svcplus
**************************************************/
-const device_type NEOGEO_SVCPLUS_CART = &device_creator<neogeo_svcplus_cart>;
+const device_type NEOGEO_SVCPLUS_CART = device_creator<neogeo_svcplus_cart>;
neogeo_svcplus_cart::neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUS_CART, "Neo Geo SVC Plus Bootleg Cart", tag, owner, clock, "neocart_svcplus", __FILE__)
@@ -63,7 +63,7 @@ void neogeo_svcplus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
svcplusa
**************************************************/
-const device_type NEOGEO_SVCPLUSA_CART = &device_creator<neogeo_svcplusa_cart>;
+const device_type NEOGEO_SVCPLUSA_CART = device_creator<neogeo_svcplusa_cart>;
neogeo_svcplusa_cart::neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUSA_CART, "Neo Geo SVC Plus Alt Bootleg Cart", tag, owner, clock, "neocart_svcplusa", __FILE__)
@@ -80,7 +80,7 @@ void neogeo_svcplusa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
svcsplus
**************************************************/
-const device_type NEOGEO_SVCSPLUS_CART = &device_creator<neogeo_svcsplus_cart>;
+const device_type NEOGEO_SVCSPLUS_CART = device_creator<neogeo_svcsplus_cart>;
neogeo_svcsplus_cart::neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCSPLUS_CART, "Neo Geo SVC S.Plus Bootleg Cart", tag, owner, clock, "neocart_svcsplus", __FILE__),
diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp
index 687a1faad07..a630d9fe0a3 100644
--- a/src/devices/bus/neogeo/cmc.cpp
+++ b/src/devices/bus/neogeo/cmc.cpp
@@ -16,7 +16,7 @@
// neogeo_cmc_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_CMC_CART = &device_creator<neogeo_cmc_cart>;
+const device_type NEOGEO_CMC_CART = device_creator<neogeo_cmc_cart>;
neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -57,7 +57,7 @@ machine_config_constructor neogeo_cmc_cart::device_mconfig_additions() const
zupapa
**************************************************/
-const device_type NEOGEO_CMC_ZUPAPA_CART = &device_creator<neogeo_cmc_zupapa_cart>;
+const device_type NEOGEO_CMC_ZUPAPA_CART = device_creator<neogeo_cmc_zupapa_cart>;
neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "Neo Geo Zupapa CMC42 Cart", tag, owner, clock, "neocart_zupapa", __FILE__)
@@ -74,7 +74,7 @@ void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
mslug3h
**************************************************/
-const device_type NEOGEO_CMC_MSLUG3H_CART = &device_creator<neogeo_cmc_mslug3h_cart>;
+const device_type NEOGEO_CMC_MSLUG3H_CART = device_creator<neogeo_cmc_mslug3h_cart>;
neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "Neo Geo Metal Slug 3 AES CMC42 Cart", tag, owner, clock, "neocart_mslug3h", __FILE__)
@@ -91,7 +91,7 @@ void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
ganryu
**************************************************/
-const device_type NEOGEO_CMC_GANRYU_CART = &device_creator<neogeo_cmc_ganryu_cart>;
+const device_type NEOGEO_CMC_GANRYU_CART = device_creator<neogeo_cmc_ganryu_cart>;
neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "Neo Geo Ganryu CMC42 Cart", tag, owner, clock, "neocart_ganryu", __FILE__)
@@ -108,7 +108,7 @@ void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS)
s1945p
**************************************************/
-const device_type NEOGEO_CMC_S1945P_CART = &device_creator<neogeo_cmc_s1945p_cart>;
+const device_type NEOGEO_CMC_S1945P_CART = device_creator<neogeo_cmc_s1945p_cart>;
neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "Neo Geo Strikers 1945 Plus CMC42 Cart", tag, owner, clock, "neocart_s1945p", __FILE__)
@@ -124,7 +124,7 @@ void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS)
preisle2
**************************************************/
-const device_type NEOGEO_CMC_PREISLE2_CART = &device_creator<neogeo_cmc_preisle2_cart>;
+const device_type NEOGEO_CMC_PREISLE2_CART = device_creator<neogeo_cmc_preisle2_cart>;
neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "Neo Geo Prehistorik Isle 2 CMC42 Cart", tag, owner, clock, "neocart_preisle2", __FILE__)
@@ -140,7 +140,7 @@ void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS)
bangbead
**************************************************/
-const device_type NEOGEO_CMC_BANGBEAD_CART = &device_creator<neogeo_cmc_bangbead_cart>;
+const device_type NEOGEO_CMC_BANGBEAD_CART = device_creator<neogeo_cmc_bangbead_cart>;
neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "Neo Geo Bangbead CMC42 Cart", tag, owner, clock, "neocart_bangbead", __FILE__)
@@ -156,7 +156,7 @@ void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS)
ntd
**************************************************/
-const device_type NEOGEO_CMC_NITD_CART = &device_creator<neogeo_cmc_nitd_cart>;
+const device_type NEOGEO_CMC_NITD_CART = device_creator<neogeo_cmc_nitd_cart>;
neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "Neo Geo NITD CMC42 Cart", tag, owner, clock, "neocart_nitd", __FILE__)
@@ -173,7 +173,7 @@ void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
sengoku3
**************************************************/
-const device_type NEOGEO_CMC_SENGOKU3_CART = &device_creator<neogeo_cmc_sengoku3_cart>;
+const device_type NEOGEO_CMC_SENGOKU3_CART = device_creator<neogeo_cmc_sengoku3_cart>;
neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "Neo Geo Sengoku 3 CMC42 Cart", tag, owner, clock, "neocart_sengoku3", __FILE__)
@@ -189,7 +189,7 @@ void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof99k
**************************************************/
-const device_type NEOGEO_CMC_KOF99K_CART = &device_creator<neogeo_cmc_kof99k_cart>;
+const device_type NEOGEO_CMC_KOF99K_CART = device_creator<neogeo_cmc_kof99k_cart>;
neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "Neo Geo KOF 99 Korea CMC42 Cart", tag, owner, clock, "neocart_kof99k", __FILE__)
@@ -206,7 +206,7 @@ void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof2001
**************************************************/
-const device_type NEOGEO_CMC_KOF2001_CART = &device_creator<neogeo_cmc_kof2001_cart>;
+const device_type NEOGEO_CMC_KOF2001_CART = device_creator<neogeo_cmc_kof2001_cart>;
neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "Neo Geo KOF 2001 CMC50 Cart", tag, owner, clock, "neocart_kof2001", __FILE__)
@@ -223,7 +223,7 @@ void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof2000n
**************************************************/
-const device_type NEOGEO_CMC_KOF2000N_CART = &device_creator<neogeo_cmc_kof2000n_cart>;
+const device_type NEOGEO_CMC_KOF2000N_CART = device_creator<neogeo_cmc_kof2000n_cart>;
neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "Neo Geo KOF 2000 CMC50 Cart", tag, owner, clock, "neocart_kof2000n", __FILE__)
@@ -241,7 +241,7 @@ void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS)
jockeygp
**************************************************/
-const device_type NEOGEO_CMC_JOCKEYGP_CART = &device_creator<neogeo_cmc_jockeygp_cart>;
+const device_type NEOGEO_CMC_JOCKEYGP_CART = device_creator<neogeo_cmc_jockeygp_cart>;
neogeo_cmc_jockeygp_cart::neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_JOCKEYGP_CART, "Neo Geo Jockey GP CMC50 Cart", tag, owner, clock, "neocart_jockeygp", __FILE__)
diff --git a/src/devices/bus/neogeo/fatfury2.cpp b/src/devices/bus/neogeo/fatfury2.cpp
index 64a2f44c6b1..995d576b5a3 100644
--- a/src/devices/bus/neogeo/fatfury2.cpp
+++ b/src/devices/bus/neogeo/fatfury2.cpp
@@ -16,7 +16,7 @@
// neogeo_fatfury2_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_FATFURY2_CART = &device_creator<neogeo_fatfury2_cart>;
+const device_type NEOGEO_FATFURY2_CART = device_creator<neogeo_fatfury2_cart>;
neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
diff --git a/src/devices/bus/neogeo/kof2k2.cpp b/src/devices/bus/neogeo/kof2k2.cpp
index 8848e7e68e0..50d2cfa94f8 100644
--- a/src/devices/bus/neogeo/kof2k2.cpp
+++ b/src/devices/bus/neogeo/kof2k2.cpp
@@ -16,7 +16,7 @@
// neogeo_kof2002_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_K2K2_CART = &device_creator<neogeo_kof2k2type_cart>;
+const device_type NEOGEO_K2K2_CART = device_creator<neogeo_kof2k2type_cart>;
neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -67,7 +67,7 @@ machine_config_constructor neogeo_kof2k2type_cart::device_mconfig_additions() co
kof2002
**************************************************/
-const device_type NEOGEO_K2K2_KOF2002_CART = &device_creator<neogeo_kof2002_cart>;
+const device_type NEOGEO_K2K2_KOF2002_CART = device_creator<neogeo_kof2002_cart>;
neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_KOF2002_CART, "Neo Geo KOF2002 Cart", tag, owner, clock, "neocart_kof2002", __FILE__)
@@ -83,7 +83,7 @@ void neogeo_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_pcm2_prot->swap(ym_region, ym_region_size, 0);
}
-const device_type NEOGEO_K2K2_KF2K2PLS_CART = &device_creator<neogeo_kf2k2pls_cart>;
+const device_type NEOGEO_K2K2_KF2K2PLS_CART = device_creator<neogeo_kf2k2pls_cart>;
/*************************************************
kf2k2pls
@@ -106,7 +106,7 @@ void neogeo_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS)
matrim
**************************************************/
-const device_type NEOGEO_K2K2_MATRIM_CART = &device_creator<neogeo_matrim_cart>;
+const device_type NEOGEO_K2K2_MATRIM_CART = device_creator<neogeo_matrim_cart>;
neogeo_matrim_cart::neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_MATRIM_CART, "Neo Geo Matrimelee Cart", tag, owner, clock, "neocart_matrim", __FILE__)
@@ -125,7 +125,7 @@ void neogeo_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS)
samsho5
**************************************************/
-const device_type NEOGEO_K2K2_SAMSHO5_CART = &device_creator<neogeo_samsho5_cart>;
+const device_type NEOGEO_K2K2_SAMSHO5_CART = device_creator<neogeo_samsho5_cart>;
neogeo_samsho5_cart::neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5_CART, "Neo Geo Samurai Shodown 5 Cart", tag, owner, clock, "neocart_samsho5", __FILE__)
@@ -144,7 +144,7 @@ void neogeo_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
samsh5sp
**************************************************/
-const device_type NEOGEO_K2K2_SAMSHO5SP_CART = &device_creator<neogeo_samsho5sp_cart>;
+const device_type NEOGEO_K2K2_SAMSHO5SP_CART = device_creator<neogeo_samsho5sp_cart>;
neogeo_samsho5sp_cart::neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5SP_CART, "Neo Geo Samurai Shodown 5 Special Cart", tag, owner, clock, "neocart_samsh5sp", __FILE__)
diff --git a/src/devices/bus/neogeo/kof98.cpp b/src/devices/bus/neogeo/kof98.cpp
index 1f7c5559ae0..0451ee6ae6b 100644
--- a/src/devices/bus/neogeo/kof98.cpp
+++ b/src/devices/bus/neogeo/kof98.cpp
@@ -16,7 +16,7 @@
// neogeo_kof98_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_KOF98_CART = &device_creator<neogeo_kof98_cart>;
+const device_type NEOGEO_KOF98_CART = device_creator<neogeo_kof98_cart>;
neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
diff --git a/src/devices/bus/neogeo/mslugx.cpp b/src/devices/bus/neogeo/mslugx.cpp
index 85dcab3ddc9..71af2d783d4 100644
--- a/src/devices/bus/neogeo/mslugx.cpp
+++ b/src/devices/bus/neogeo/mslugx.cpp
@@ -16,7 +16,7 @@
// neogeo_mslugx_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_MSLUGX_CART = &device_creator<neogeo_mslugx_cart>;
+const device_type NEOGEO_MSLUGX_CART = device_creator<neogeo_mslugx_cart>;
neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
diff --git a/src/devices/bus/neogeo/pcm2.cpp b/src/devices/bus/neogeo/pcm2.cpp
index e49ebd06261..54ff35b8e33 100644
--- a/src/devices/bus/neogeo/pcm2.cpp
+++ b/src/devices/bus/neogeo/pcm2.cpp
@@ -16,7 +16,7 @@
// neogeo_pcm2_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_PCM2_CART = &device_creator<neogeo_pcm2_cart>;
+const device_type NEOGEO_PCM2_CART = device_creator<neogeo_pcm2_cart>;
neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -64,7 +64,7 @@ machine_config_constructor neogeo_pcm2_cart::device_mconfig_additions() const
mslug4
**************************************************/
-const device_type NEOGEO_PCM2_MSLUG4_CART = &device_creator<neogeo_pcm2_mslug4_cart>;
+const device_type NEOGEO_PCM2_MSLUG4_CART = device_creator<neogeo_pcm2_mslug4_cart>;
neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "Neo Geo Metal Slug 4 PCM2 Cart", tag, owner, clock, "neocart_mslug4", __FILE__)
@@ -83,7 +83,7 @@ void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS)
ms4plus
**************************************************/
-const device_type NEOGEO_PCM2_MS4PLUS_CART = &device_creator<neogeo_pcm2_ms4plus_cart>;
+const device_type NEOGEO_PCM2_MS4PLUS_CART = device_creator<neogeo_pcm2_ms4plus_cart>;
neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "Neo Geo Metal Slug 4 Plus PCM2 Cart", tag, owner, clock, "neocart_ms4plus", __FILE__)
@@ -101,7 +101,7 @@ void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
rotd
**************************************************/
-const device_type NEOGEO_PCM2_ROTD_CART = &device_creator<neogeo_pcm2_rotd_cart>;
+const device_type NEOGEO_PCM2_ROTD_CART = device_creator<neogeo_pcm2_rotd_cart>;
neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "Neo Geo Rage of the Dragon PCM2 Cart", tag, owner, clock, "neocart_rotd", __FILE__)
@@ -119,7 +119,7 @@ void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
pnyaa
**************************************************/
-const device_type NEOGEO_PCM2_PNYAA_CART = &device_creator<neogeo_pcm2_pnyaa_cart>;
+const device_type NEOGEO_PCM2_PNYAA_CART = device_creator<neogeo_pcm2_pnyaa_cart>;
neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "Neo Geo Pnyaa PCM2 Cart", tag, owner, clock, "neocart_pnyaa", __FILE__)
diff --git a/src/devices/bus/neogeo/prot_cmc.cpp b/src/devices/bus/neogeo/prot_cmc.cpp
index a08f9ede36b..98cc9ce990e 100644
--- a/src/devices/bus/neogeo/prot_cmc.cpp
+++ b/src/devices/bus/neogeo/prot_cmc.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "prot_cmc.h"
-extern const device_type CMC_PROT = &device_creator<cmc_prot_device>;
+const device_type CMC_PROT = device_creator<cmc_prot_device>;
cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_cthd.cpp b/src/devices/bus/neogeo/prot_cthd.cpp
index f94993d1228..226ae50d40b 100644
--- a/src/devices/bus/neogeo/prot_cthd.cpp
+++ b/src/devices/bus/neogeo/prot_cthd.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "prot_cthd.h"
-extern const device_type CTHD_PROT = &device_creator<cthd_prot_device>;
+const device_type CTHD_PROT = device_creator<cthd_prot_device>;
cthd_prot_device::cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_fatfury2.cpp b/src/devices/bus/neogeo/prot_fatfury2.cpp
index 6398a0db2e5..ccf29bb3484 100644
--- a/src/devices/bus/neogeo/prot_fatfury2.cpp
+++ b/src/devices/bus/neogeo/prot_fatfury2.cpp
@@ -6,7 +6,7 @@
-extern const device_type FATFURY2_PROT = &device_creator<fatfury2_prot_device>;
+const device_type FATFURY2_PROT = device_creator<fatfury2_prot_device>;
fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_kof2k2.cpp b/src/devices/bus/neogeo/prot_kof2k2.cpp
index 4fc088adc53..a735a34e52e 100644
--- a/src/devices/bus/neogeo/prot_kof2k2.cpp
+++ b/src/devices/bus/neogeo/prot_kof2k2.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "prot_kof2k2.h"
-extern const device_type KOF2002_PROT = &device_creator<kof2002_prot_device>;
+const device_type KOF2002_PROT = device_creator<kof2002_prot_device>;
kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/neogeo/prot_kof2k3bl.cpp b/src/devices/bus/neogeo/prot_kof2k3bl.cpp
index 2806af3a45b..bdf46df09c2 100644
--- a/src/devices/bus/neogeo/prot_kof2k3bl.cpp
+++ b/src/devices/bus/neogeo/prot_kof2k3bl.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "prot_kof2k3bl.h"
-extern const device_type KOF2K3BL_PROT = &device_creator<kof2k3bl_prot_device>;
+const device_type KOF2K3BL_PROT = device_creator<kof2k3bl_prot_device>;
kof2k3bl_prot_device::kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_kof98.cpp b/src/devices/bus/neogeo/prot_kof98.cpp
index ee72c203273..bc1d1cb43ba 100644
--- a/src/devices/bus/neogeo/prot_kof98.cpp
+++ b/src/devices/bus/neogeo/prot_kof98.cpp
@@ -5,7 +5,7 @@
#include "emu.h"
#include "prot_kof98.h"
-extern const device_type KOF98_PROT = &device_creator<kof98_prot_device>;
+const device_type KOF98_PROT = device_creator<kof98_prot_device>;
kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_misc.cpp b/src/devices/bus/neogeo/prot_misc.cpp
index 825d630e1d9..349d294deb6 100644
--- a/src/devices/bus/neogeo/prot_misc.cpp
+++ b/src/devices/bus/neogeo/prot_misc.cpp
@@ -23,7 +23,7 @@
#include "prot_misc.h"
-extern const device_type NEOBOOT_PROT = &device_creator<neoboot_prot_device>;
+const device_type NEOBOOT_PROT = device_creator<neoboot_prot_device>;
neoboot_prot_device::neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_mslugx.cpp b/src/devices/bus/neogeo/prot_mslugx.cpp
index 85321f8c92c..d505fea7df8 100644
--- a/src/devices/bus/neogeo/prot_mslugx.cpp
+++ b/src/devices/bus/neogeo/prot_mslugx.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "prot_mslugx.h"
-extern const device_type MSLUGX_PROT = &device_creator<mslugx_prot_device>;
+const device_type MSLUGX_PROT = device_creator<mslugx_prot_device>;
mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_pcm2.cpp b/src/devices/bus/neogeo/prot_pcm2.cpp
index 36d5557d817..01f56a8fb0a 100644
--- a/src/devices/bus/neogeo/prot_pcm2.cpp
+++ b/src/devices/bus/neogeo/prot_pcm2.cpp
@@ -6,7 +6,7 @@
#include "prot_pcm2.h"
-extern const device_type PCM2_PROT = &device_creator<pcm2_prot_device>;
+const device_type PCM2_PROT = device_creator<pcm2_prot_device>;
pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/neogeo/prot_pvc.cpp b/src/devices/bus/neogeo/prot_pvc.cpp
index 82ca811a111..a07af85222d 100644
--- a/src/devices/bus/neogeo/prot_pvc.cpp
+++ b/src/devices/bus/neogeo/prot_pvc.cpp
@@ -7,7 +7,7 @@
-extern const device_type PVC_PROT = &device_creator<pvc_prot_device>;
+const device_type PVC_PROT = device_creator<pvc_prot_device>;
pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/prot_sma.cpp b/src/devices/bus/neogeo/prot_sma.cpp
index 9262178be4f..8c4dfa169d5 100644
--- a/src/devices/bus/neogeo/prot_sma.cpp
+++ b/src/devices/bus/neogeo/prot_sma.cpp
@@ -5,7 +5,7 @@
#include "prot_sma.h"
-extern const device_type SMA_PROT = &device_creator<sma_prot_device>;
+const device_type SMA_PROT = device_creator<sma_prot_device>;
sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/neogeo/pvc.cpp b/src/devices/bus/neogeo/pvc.cpp
index 4787aee080f..4830603b209 100644
--- a/src/devices/bus/neogeo/pvc.cpp
+++ b/src/devices/bus/neogeo/pvc.cpp
@@ -16,7 +16,7 @@
// neogeo_pvc_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_PVC_CART = &device_creator<neogeo_pvc_cart>;
+const device_type NEOGEO_PVC_CART = device_creator<neogeo_pvc_cart>;
neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -69,7 +69,7 @@ machine_config_constructor neogeo_pvc_cart::device_mconfig_additions() const
mslug5
**************************************************/
-const device_type NEOGEO_PVC_MSLUG5_CART = &device_creator<neogeo_pvc_mslug5_cart>;
+const device_type NEOGEO_PVC_MSLUG5_CART = device_creator<neogeo_pvc_mslug5_cart>;
neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "Neo Geo Metal Slug 5 PVC Cart", tag, owner, clock, "neocart_mslug5", __FILE__) {}
@@ -87,7 +87,7 @@ void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
svc
**************************************************/
-const device_type NEOGEO_PVC_SVC_CART = &device_creator<neogeo_pvc_svc_cart>;
+const device_type NEOGEO_PVC_SVC_CART = device_creator<neogeo_pvc_svc_cart>;
neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "Neo Geo SNK vs Capcom PVC Cart", tag, owner, clock, "neocart_svc", __FILE__)
@@ -107,7 +107,7 @@ void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof2003
**************************************************/
-const device_type NEOGEO_PVC_KOF2003_CART = &device_creator<neogeo_pvc_kof2003_cart>;
+const device_type NEOGEO_PVC_KOF2003_CART = device_creator<neogeo_pvc_kof2003_cart>;
neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "Neo Geo KOF 2003 PVC Cart", tag, owner, clock, "neocart_kof2003", __FILE__)
@@ -126,7 +126,7 @@ void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof2003h
**************************************************/
-const device_type NEOGEO_PVC_KOF2003H_CART = &device_creator<neogeo_pvc_kof2003h_cart>;
+const device_type NEOGEO_PVC_KOF2003H_CART = device_creator<neogeo_pvc_kof2003h_cart>;
neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "Neo Geo KOF 2003 AES PVC Cart", tag, owner, clock, "neocart_kof2003h", __FILE__)
diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp
index ddfdb18213d..e01bfbe6249 100644
--- a/src/devices/bus/neogeo/rom.cpp
+++ b/src/devices/bus/neogeo/rom.cpp
@@ -17,7 +17,7 @@
// neogeo_rom_device - constructor
//-------------------------------------------------
-const device_type NEOGEO_ROM = &device_creator<neogeo_rom_device>;
+const device_type NEOGEO_ROM = device_creator<neogeo_rom_device>;
neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -69,7 +69,7 @@ WRITE16_MEMBER(neogeo_rom_device::banksel_w)
V-Liner : this is plain NeoGeo cart + RAM
**************************************************/
-const device_type NEOGEO_VLINER_CART = &device_creator<neogeo_vliner_cart>;
+const device_type NEOGEO_VLINER_CART = device_creator<neogeo_vliner_cart>;
neogeo_vliner_cart::neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_rom_device(mconfig, NEOGEO_VLINER_CART, "Neo Geo V-Liner Cart", tag, owner, clock, "neocart_vliner", __FILE__)
diff --git a/src/devices/bus/neogeo/sbp.cpp b/src/devices/bus/neogeo/sbp.cpp
index 5947bab07da..82b6ef897c4 100644
--- a/src/devices/bus/neogeo/sbp.cpp
+++ b/src/devices/bus/neogeo/sbp.cpp
@@ -14,7 +14,7 @@
#include "emu.h"
#include "sbp.h"
-extern const device_type NEOGEO_SBP_CART = &device_creator<neogeo_sbp_cart>;
+const device_type NEOGEO_SBP_CART = device_creator<neogeo_sbp_cart>;
neogeo_sbp_cart::neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_rom_device(mconfig, NEOGEO_SBP_CART, "Neo Geo Super Bubble Pop Cart", tag, owner, clock, "neocart_sbp", __FILE__)
diff --git a/src/devices/bus/neogeo/slot.cpp b/src/devices/bus/neogeo/slot.cpp
index b4dcf7ddfff..3cf6d9f51bb 100644
--- a/src/devices/bus/neogeo/slot.cpp
+++ b/src/devices/bus/neogeo/slot.cpp
@@ -13,7 +13,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NEOGEO_CART_SLOT = &device_creator<neogeo_cart_slot_device>;
+const device_type NEOGEO_CART_SLOT = device_creator<neogeo_cart_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/neogeo/sma.cpp b/src/devices/bus/neogeo/sma.cpp
index f376297b24d..4c2beb8c9b4 100644
--- a/src/devices/bus/neogeo/sma.cpp
+++ b/src/devices/bus/neogeo/sma.cpp
@@ -16,7 +16,7 @@
// neogeo_sma_cart - constructor
//-------------------------------------------------
-const device_type NEOGEO_SMA_CART = &device_creator<neogeo_sma_cart>;
+const device_type NEOGEO_SMA_CART = device_creator<neogeo_sma_cart>;
neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
@@ -64,7 +64,7 @@ machine_config_constructor neogeo_sma_cart::device_mconfig_additions() const
kof99
**************************************************/
-const device_type NEOGEO_SMA_KOF99_CART = &device_creator<neogeo_sma_kof99_cart>;
+const device_type NEOGEO_SMA_KOF99_CART = device_creator<neogeo_sma_kof99_cart>;
neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "Neo Geo KOF 99 SMA Cart", tag, owner, clock, "neocart_kof99", __FILE__)
@@ -82,7 +82,7 @@ void neogeo_sma_kof99_cart::decrypt_all(DECRYPT_ALL_PARAMS)
garou
**************************************************/
-const device_type NEOGEO_SMA_GAROU_CART = &device_creator<neogeo_sma_garou_cart>;
+const device_type NEOGEO_SMA_GAROU_CART = device_creator<neogeo_sma_garou_cart>;
neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "Neo Geo Garou SMA Cart", tag, owner, clock, "neocart_garou", __FILE__)
@@ -100,7 +100,7 @@ void neogeo_sma_garou_cart::decrypt_all(DECRYPT_ALL_PARAMS)
garouh
**************************************************/
-const device_type NEOGEO_SMA_GAROUH_CART = &device_creator<neogeo_sma_garouh_cart>;
+const device_type NEOGEO_SMA_GAROUH_CART = device_creator<neogeo_sma_garouh_cart>;
neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROUH_CART, "Neo Geo Garou AES SMA Cart", tag, owner, clock, "neocart_garouh", __FILE__)
@@ -118,7 +118,7 @@ void neogeo_sma_garouh_cart::decrypt_all(DECRYPT_ALL_PARAMS)
mslug3
**************************************************/
-const device_type NEOGEO_SMA_MSLUG3_CART = &device_creator<neogeo_sma_mslug3_cart>;
+const device_type NEOGEO_SMA_MSLUG3_CART = device_creator<neogeo_sma_mslug3_cart>;
neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "Neo Geo Metal Slug 3 SMA Cart", tag, owner, clock, "neocart_mslug3", __FILE__)
@@ -136,7 +136,7 @@ void neogeo_sma_mslug3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
kof2000
**************************************************/
-const device_type NEOGEO_SMA_KOF2000_CART = &device_creator<neogeo_sma_kof2000_cart>;
+const device_type NEOGEO_SMA_KOF2000_CART = device_creator<neogeo_sma_kof2000_cart>;
neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "Neo Geo KOF 2000 SMA Cart", tag, owner, clock, "neocart_kof2000", __FILE__)
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp
index 0ec1db0bfa7..870f830c4d1 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.cpp
+++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp
@@ -30,8 +30,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NEOGEO_CONTROL_PORT = &device_creator<neogeo_control_port_device>;
-const device_type NEOGEO_CTRL_EDGE_CONNECTOR = &device_creator<neogeo_ctrl_edge_port_device>;
+const device_type NEOGEO_CONTROL_PORT = device_creator<neogeo_control_port_device>;
+const device_type NEOGEO_CTRL_EDGE_CONNECTOR = device_creator<neogeo_ctrl_edge_port_device>;
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/dial.cpp b/src/devices/bus/neogeo_ctrl/dial.cpp
index 95eaec1b5f2..6211a5b9ee1 100644
--- a/src/devices/bus/neogeo_ctrl/dial.cpp
+++ b/src/devices/bus/neogeo_ctrl/dial.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_DIAL = &device_creator<neogeo_dial_device>;
+const device_type NEOGEO_DIAL = device_creator<neogeo_dial_device>;
static INPUT_PORTS_START( neogeo_dial )
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.cpp b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
index e612df7130b..51bc3cb043d 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.cpp
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_IRRMAZE = &device_creator<neogeo_irrmaze_device>;
+const device_type NEOGEO_IRRMAZE = device_creator<neogeo_irrmaze_device>;
static INPUT_PORTS_START( neogeo_irrmaze )
diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp
index 3441a522e34..dabed0aa13e 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.cpp
+++ b/src/devices/bus/neogeo_ctrl/joystick.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_JOY = &device_creator<neogeo_joystick_device>;
+const device_type NEOGEO_JOY = device_creator<neogeo_joystick_device>;
static INPUT_PORTS_START( neogeo_joy )
@@ -118,7 +118,7 @@ uint8_t neogeo_joystick_device::read_start_sel()
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_JOY_AC = &device_creator<neogeo_joy_ac_device>;
+const device_type NEOGEO_JOY_AC = device_creator<neogeo_joy_ac_device>;
static INPUT_PORTS_START( neogeo_joy_ac )
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
index f4dc05779f7..72854f62241 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_KIZ4P = &device_creator<neogeo_kizuna4p_device>;
+const device_type NEOGEO_KIZ4P = device_creator<neogeo_kizuna4p_device>;
static INPUT_PORTS_START( neogeo_kiz4p )
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.cpp b/src/devices/bus/neogeo_ctrl/mahjong.cpp
index 2eeb5b7586f..149c252f386 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.cpp
+++ b/src/devices/bus/neogeo_ctrl/mahjong.cpp
@@ -13,8 +13,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEOGEO_MJCTRL_AC = &device_creator<neogeo_mjctrl_ac_device>;
-const device_type NEOGEO_MJCTRL = &device_creator<neogeo_mjctrl_device>;
+const device_type NEOGEO_MJCTRL_AC = device_creator<neogeo_mjctrl_ac_device>;
+const device_type NEOGEO_MJCTRL = device_creator<neogeo_mjctrl_device>;
static INPUT_PORTS_START( neogeo_mj_ac )
diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp
index 9fc9da33883..8382814efe0 100644
--- a/src/devices/bus/nes/2a03pur.cpp
+++ b/src/devices/bus/nes/2a03pur.cpp
@@ -31,7 +31,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_2A03PURITANS = &device_creator<nes_2a03pur_device>;
+const device_type NES_2A03PURITANS = device_creator<nes_2a03pur_device>;
nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp
index 98bc04539ef..6dce9e066c3 100644
--- a/src/devices/bus/nes/act53.cpp
+++ b/src/devices/bus/nes/act53.cpp
@@ -29,7 +29,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_ACTION53 = &device_creator<nes_action53_device>;
+const device_type NES_ACTION53 = device_creator<nes_action53_device>;
nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp
index 9eb9983f6b9..ce58a7e54c1 100644
--- a/src/devices/bus/nes/aladdin.cpp
+++ b/src/devices/bus/nes/aladdin.cpp
@@ -64,7 +64,7 @@ READ8_MEMBER(aladdin_cart_interface::read)
// sub-cart slot device
//-------------------------------------------------
-const device_type NES_ALADDIN_SLOT = &device_creator<nes_aladdin_slot_device>;
+const device_type NES_ALADDIN_SLOT = device_creator<nes_aladdin_slot_device>;
nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__),
@@ -174,8 +174,8 @@ ROM_START( ade_rom )
ROM_REGION(0x40000, "aderom", ROMREGION_ERASEFF)
ROM_END
-const device_type NES_ALGN_ROM = &device_creator<nes_algn_rom_device>;
-const device_type NES_ALGQ_ROM = &device_creator<nes_algq_rom_device>;
+const device_type NES_ALGN_ROM = device_creator<nes_algn_rom_device>;
+const device_type NES_ALGQ_ROM = device_creator<nes_algq_rom_device>;
nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
@@ -262,7 +262,7 @@ void nes_algq_rom_device::write_prg(uint32_t offset, uint8_t data)
//
//-----------------------------------------------
-const device_type NES_ALADDIN = &device_creator<nes_aladdin_device>;
+const device_type NES_ALADDIN = device_creator<nes_aladdin_device>;
nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_ALADDIN, "NES Cart Camerica Aladdin PCB", tag, owner, clock, "nes_aladdin", __FILE__),
diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp
index 9634f39e202..fcc757b7651 100644
--- a/src/devices/bus/nes/ave.cpp
+++ b/src/devices/bus/nes/ave.cpp
@@ -33,9 +33,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_NINA001 = &device_creator<nes_nina001_device>;
-const device_type NES_NINA006 = &device_creator<nes_nina006_device>;
-const device_type NES_MAXI15 = &device_creator<nes_maxi15_device>;
+const device_type NES_NINA001 = device_creator<nes_nina001_device>;
+const device_type NES_NINA006 = device_creator<nes_nina006_device>;
+const device_type NES_MAXI15 = device_creator<nes_maxi15_device>;
nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp
index 8a3af94a65f..e75b6401205 100644
--- a/src/devices/bus/nes/bandai.cpp
+++ b/src/devices/bus/nes/bandai.cpp
@@ -50,12 +50,12 @@
// constructor
//-------------------------------------------------
-const device_type NES_OEKAKIDS = &device_creator<nes_oekakids_device>;
-const device_type NES_FCG = &device_creator<nes_fcg_device>;
-const device_type NES_LZ93D50 = &device_creator<nes_lz93d50_device>;
-const device_type NES_LZ93D50_24C01 = &device_creator<nes_lz93d50_24c01_device>;
-const device_type NES_LZ93D50_24C02 = &device_creator<nes_lz93d50_24c02_device>;
-const device_type NES_FJUMP2 = &device_creator<nes_fjump2_device>;
+const device_type NES_OEKAKIDS = device_creator<nes_oekakids_device>;
+const device_type NES_FCG = device_creator<nes_fcg_device>;
+const device_type NES_LZ93D50 = device_creator<nes_lz93d50_device>;
+const device_type NES_LZ93D50_24C01 = device_creator<nes_lz93d50_24c01_device>;
+const device_type NES_LZ93D50_24C02 = device_creator<nes_lz93d50_24c02_device>;
+const device_type NES_FJUMP2 = device_creator<nes_fjump2_device>;
nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp
index 803b4413c54..0d41c8b3ae0 100644
--- a/src/devices/bus/nes/benshieng.cpp
+++ b/src/devices/bus/nes/benshieng.cpp
@@ -28,7 +28,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_BENSHIENG = &device_creator<nes_benshieng_device>;
+const device_type NES_BENSHIENG = device_creator<nes_benshieng_device>;
nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp
index 094ec65dd22..f38e92d8e97 100644
--- a/src/devices/bus/nes/bootleg.cpp
+++ b/src/devices/bus/nes/bootleg.cpp
@@ -23,6 +23,7 @@
#include "cpu/m6502/m6502.h"
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE
+#include "screen.h"
#ifdef NES_PCB_DEBUG
@@ -38,27 +39,27 @@
// constructor
//-------------------------------------------------
-const device_type NES_AX5705 = &device_creator<nes_ax5705_device>;
-const device_type NES_SC127 = &device_creator<nes_sc127_device>;
-const device_type NES_MARIOBABY = &device_creator<nes_mbaby_device>;
-const device_type NES_ASN = &device_creator<nes_asn_device>;
-const device_type NES_SMB3PIRATE = &device_creator<nes_smb3p_device>;
-const device_type NES_BTL_DNINJA = &device_creator<nes_btl_dn_device>;
-const device_type NES_WHIRLWIND_2706 = &device_creator<nes_whirl2706_device>;
-const device_type NES_SMB2J = &device_creator<nes_smb2j_device>;
-const device_type NES_SMB2JA = &device_creator<nes_smb2ja_device>;
-const device_type NES_SMB2JB = &device_creator<nes_smb2jb_device>;
-const device_type NES_09034A = &device_creator<nes_09034a_device>;
-const device_type NES_TOBIDASE = &device_creator<nes_tobidase_device>;
-const device_type NES_LH32 = &device_creator<nes_lh32_device>;
-const device_type NES_LH10 = &device_creator<nes_lh10_device>;
-const device_type NES_LH53 = &device_creator<nes_lh53_device>;
-const device_type NES_2708 = &device_creator<nes_2708_device>;
-const device_type NES_AC08 = &device_creator<nes_ac08_device>;
-const device_type NES_UNL_BB = &device_creator<nes_unl_bb_device>;
-const device_type NES_MMALEE = &device_creator<nes_mmalee_device>;
-const device_type NES_SHUIGUAN = &device_creator<nes_shuiguan_device>;
-const device_type NES_RT01 = &device_creator<nes_rt01_device>;
+const device_type NES_AX5705 = device_creator<nes_ax5705_device>;
+const device_type NES_SC127 = device_creator<nes_sc127_device>;
+const device_type NES_MARIOBABY = device_creator<nes_mbaby_device>;
+const device_type NES_ASN = device_creator<nes_asn_device>;
+const device_type NES_SMB3PIRATE = device_creator<nes_smb3p_device>;
+const device_type NES_BTL_DNINJA = device_creator<nes_btl_dn_device>;
+const device_type NES_WHIRLWIND_2706 = device_creator<nes_whirl2706_device>;
+const device_type NES_SMB2J = device_creator<nes_smb2j_device>;
+const device_type NES_SMB2JA = device_creator<nes_smb2ja_device>;
+const device_type NES_SMB2JB = device_creator<nes_smb2jb_device>;
+const device_type NES_09034A = device_creator<nes_09034a_device>;
+const device_type NES_TOBIDASE = device_creator<nes_tobidase_device>;
+const device_type NES_LH32 = device_creator<nes_lh32_device>;
+const device_type NES_LH10 = device_creator<nes_lh10_device>;
+const device_type NES_LH53 = device_creator<nes_lh53_device>;
+const device_type NES_2708 = device_creator<nes_2708_device>;
+const device_type NES_AC08 = device_creator<nes_ac08_device>;
+const device_type NES_UNL_BB = device_creator<nes_unl_bb_device>;
+const device_type NES_MMALEE = device_creator<nes_mmalee_device>;
+const device_type NES_SHUIGUAN = device_creator<nes_shuiguan_device>;
+const device_type NES_RT01 = device_creator<nes_rt01_device>;
nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp
index 9d9a9a6f8ec..ca4e31bc11f 100644
--- a/src/devices/bus/nes/camerica.cpp
+++ b/src/devices/bus/nes/camerica.cpp
@@ -41,9 +41,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_BF9093 = &device_creator<nes_bf9093_device>;
-const device_type NES_BF9096 = &device_creator<nes_bf9096_device>;
-const device_type NES_GOLDEN5 = &device_creator<nes_golden5_device>;
+const device_type NES_BF9093 = device_creator<nes_bf9093_device>;
+const device_type NES_BF9096 = device_creator<nes_bf9096_device>;
+const device_type NES_GOLDEN5 = device_creator<nes_golden5_device>;
nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp
index eb4a2c8d33a..616814bbdc2 100644
--- a/src/devices/bus/nes/cne.cpp
+++ b/src/devices/bus/nes/cne.cpp
@@ -32,9 +32,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_CNE_DECATHL = &device_creator<nes_cne_decathl_device>;
-const device_type NES_CNE_FSB = &device_creator<nes_cne_fsb_device>;
-const device_type NES_CNE_SHLZ = &device_creator<nes_cne_shlz_device>;
+const device_type NES_CNE_DECATHL = device_creator<nes_cne_decathl_device>;
+const device_type NES_CNE_FSB = device_creator<nes_cne_fsb_device>;
+const device_type NES_CNE_SHLZ = device_creator<nes_cne_shlz_device>;
nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp
index 0fbebcda02f..3dbb66a7fb0 100644
--- a/src/devices/bus/nes/cony.cpp
+++ b/src/devices/bus/nes/cony.cpp
@@ -35,8 +35,8 @@
// constructor
//-------------------------------------------------
-const device_type NES_CONY = &device_creator<nes_cony_device>;
-const device_type NES_YOKO = &device_creator<nes_yoko_device>;
+const device_type NES_CONY = device_creator<nes_cony_device>;
+const device_type NES_YOKO = device_creator<nes_yoko_device>;
nes_cony_device::nes_cony_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)
diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp
index c67c077ce4a..f4ac341d65b 100644
--- a/src/devices/bus/nes/datach.cpp
+++ b/src/devices/bus/nes/datach.cpp
@@ -65,7 +65,7 @@ READ8_MEMBER(datach_cart_interface::read)
// sub-cart slot device
//-------------------------------------------------
-const device_type NES_DATACH_SLOT = &device_creator<nes_datach_slot_device>;
+const device_type NES_DATACH_SLOT = device_creator<nes_datach_slot_device>;
nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__),
@@ -159,8 +159,8 @@ ROM_START( datach_rom )
ROM_REGION(0x40000, "datachrom", ROMREGION_ERASEFF)
ROM_END
-const device_type NES_DATACH_ROM = &device_creator<nes_datach_rom_device>;
-const device_type NES_DATACH_24C01 = &device_creator<nes_datach_24c01_device>;
+const device_type NES_DATACH_ROM = device_creator<nes_datach_rom_device>;
+const device_type NES_DATACH_24C01 = device_creator<nes_datach_24c01_device>;
nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
@@ -218,7 +218,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c
//
//---------------------------------
-const device_type NES_DATACH = &device_creator<nes_datach_device>;
+const device_type NES_DATACH = device_creator<nes_datach_device>;
nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp
index a99b66fd77a..99751d689a1 100644
--- a/src/devices/bus/nes/discrete.cpp
+++ b/src/devices/bus/nes/discrete.cpp
@@ -35,10 +35,10 @@
// constructor
//-------------------------------------------------
-const device_type NES_74X161X161X32 = &device_creator<nes_74x161x161x32_device>;
-const device_type NES_74X139X74 = &device_creator<nes_74x139x74_device>;
-const device_type NES_74X377 = &device_creator<nes_74x377_device>;
-const device_type NES_74X161X138 = &device_creator<nes_74x161x138_device>;
+const device_type NES_74X161X161X32 = device_creator<nes_74x161x161x32_device>;
+const device_type NES_74X139X74 = device_creator<nes_74x139x74_device>;
+const device_type NES_74X377 = device_creator<nes_74x377_device>;
+const device_type NES_74X161X138 = device_creator<nes_74x161x138_device>;
nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp
index 9411c6bf8b0..11ad8c7c7a9 100644
--- a/src/devices/bus/nes/disksys.cpp
+++ b/src/devices/bus/nes/disksys.cpp
@@ -100,7 +100,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image)
//
//------------------------------------------------
-const device_type NES_DISKSYS = &device_creator<nes_disksys_device>;
+const device_type NES_DISKSYS = device_creator<nes_disksys_device>;
nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp
index 95197bb70bb..2440926cd1a 100644
--- a/src/devices/bus/nes/event.cpp
+++ b/src/devices/bus/nes/event.cpp
@@ -32,7 +32,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_EVENT = &device_creator<nes_event_device>;
+const device_type NES_EVENT = device_creator<nes_event_device>;
nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp
index 7831f91b717..2064b6e014b 100644
--- a/src/devices/bus/nes/ggenie.cpp
+++ b/src/devices/bus/nes/ggenie.cpp
@@ -30,7 +30,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_GGENIE = &device_creator<nes_ggenie_device>;
+const device_type NES_GGENIE = device_creator<nes_ggenie_device>;
nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp
index 2665dff69a2..eb69e5b3d94 100644
--- a/src/devices/bus/nes/henggedianzi.cpp
+++ b/src/devices/bus/nes/henggedianzi.cpp
@@ -38,9 +38,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_HENGG_SRICH = &device_creator<nes_hengg_srich_device>;
-const device_type NES_HENGG_XHZS = &device_creator<nes_hengg_xhzs_device>;
-const device_type NES_HENGG_SHJY3 = &device_creator<nes_hengg_shjy3_device>;
+const device_type NES_HENGG_SRICH = device_creator<nes_hengg_srich_device>;
+const device_type NES_HENGG_XHZS = device_creator<nes_hengg_xhzs_device>;
+const device_type NES_HENGG_SHJY3 = device_creator<nes_hengg_shjy3_device>;
nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp
index 5daae861b6e..25d34fc4677 100644
--- a/src/devices/bus/nes/hes.cpp
+++ b/src/devices/bus/nes/hes.cpp
@@ -30,7 +30,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_HES = &device_creator<nes_hes_device>;
+const device_type NES_HES = device_creator<nes_hes_device>;
nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp
index f9dccb9dbd8..a0eedabcd79 100644
--- a/src/devices/bus/nes/hosenkan.cpp
+++ b/src/devices/bus/nes/hosenkan.cpp
@@ -14,6 +14,7 @@
#include "cpu/m6502/m6502.h"
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE
+#include "screen.h"
#ifdef NES_PCB_DEBUG
@@ -29,7 +30,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_HOSENKAN = &device_creator<nes_hosenkan_device>;
+const device_type NES_HOSENKAN = device_creator<nes_hosenkan_device>;
nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp
index 5dea3e46832..c780d67315d 100644
--- a/src/devices/bus/nes/irem.cpp
+++ b/src/devices/bus/nes/irem.cpp
@@ -35,11 +35,11 @@
// constructor
//-------------------------------------------------
-const device_type NES_LROG017 = &device_creator<nes_lrog017_device>;
-const device_type NES_HOLYDIVR = &device_creator<nes_holydivr_device>;
-const device_type NES_TAM_S1 = &device_creator<nes_tam_s1_device>;
-const device_type NES_G101 = &device_creator<nes_g101_device>;
-const device_type NES_H3001 = &device_creator<nes_h3001_device>;
+const device_type NES_LROG017 = device_creator<nes_lrog017_device>;
+const device_type NES_HOLYDIVR = device_creator<nes_holydivr_device>;
+const device_type NES_TAM_S1 = device_creator<nes_tam_s1_device>;
+const device_type NES_G101 = device_creator<nes_g101_device>;
+const device_type NES_H3001 = device_creator<nes_h3001_device>;
nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp
index f910b840b70..9a3ca8922fa 100644
--- a/src/devices/bus/nes/jaleco.cpp
+++ b/src/devices/bus/nes/jaleco.cpp
@@ -23,6 +23,8 @@
#include "cpu/m6502/m6502.h"
#include "sound/samples.h"
+#include "speaker.h"
+
#ifdef NES_PCB_DEBUG
#define VERBOSE 1
@@ -37,18 +39,18 @@
// constructor
//-------------------------------------------------
-const device_type NES_JF11 = &device_creator<nes_jf11_device>;
-const device_type NES_JF16 = &device_creator<nes_jf16_device>;
-const device_type NES_JF17 = &device_creator<nes_jf17_device>;
-const device_type NES_JF19 = &device_creator<nes_jf19_device>;
-const device_type NES_SS88006 = &device_creator<nes_ss88006_device>;
-const device_type NES_JF13 = &device_creator<nes_jf13_device>;
-const device_type NES_JF17_ADPCM = &device_creator<nes_jf17_adpcm_device>;
-const device_type NES_JF19_ADPCM = &device_creator<nes_jf19_adpcm_device>;
-const device_type NES_JF23 = &device_creator<nes_jf23_device>;
-const device_type NES_JF24 = &device_creator<nes_jf24_device>;
-const device_type NES_JF29 = &device_creator<nes_jf29_device>;
-const device_type NES_JF33 = &device_creator<nes_jf33_device>;
+const device_type NES_JF11 = device_creator<nes_jf11_device>;
+const device_type NES_JF16 = device_creator<nes_jf16_device>;
+const device_type NES_JF17 = device_creator<nes_jf17_device>;
+const device_type NES_JF19 = device_creator<nes_jf19_device>;
+const device_type NES_SS88006 = device_creator<nes_ss88006_device>;
+const device_type NES_JF13 = device_creator<nes_jf13_device>;
+const device_type NES_JF17_ADPCM = device_creator<nes_jf17_adpcm_device>;
+const device_type NES_JF19_ADPCM = device_creator<nes_jf19_adpcm_device>;
+const device_type NES_JF23 = device_creator<nes_jf23_device>;
+const device_type NES_JF24 = device_creator<nes_jf24_device>;
+const device_type NES_JF29 = device_creator<nes_jf29_device>;
+const device_type NES_JF33 = device_creator<nes_jf33_device>;
nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp
index acba59d0a18..d7582128e80 100644
--- a/src/devices/bus/nes/jy.cpp
+++ b/src/devices/bus/nes/jy.cpp
@@ -37,9 +37,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_JY_TYPEA = &device_creator<nes_jy_typea_device>;
-const device_type NES_JY_TYPEB = &device_creator<nes_jy_typeb_device>;
-const device_type NES_JY_TYPEC = &device_creator<nes_jy_typec_device>;
+const device_type NES_JY_TYPEA = device_creator<nes_jy_typea_device>;
+const device_type NES_JY_TYPEB = device_creator<nes_jy_typeb_device>;
+const device_type NES_JY_TYPEC = device_creator<nes_jy_typec_device>;
nes_jy_typea_device::nes_jy_typea_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)
diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp
index 4dfdeb867d6..c01d4819541 100644
--- a/src/devices/bus/nes/kaiser.cpp
+++ b/src/devices/bus/nes/kaiser.cpp
@@ -48,16 +48,16 @@
// constructor
//-------------------------------------------------
-const device_type NES_KS7058 = &device_creator<nes_ks7058_device>;
-const device_type NES_KS7022 = &device_creator<nes_ks7022_device>;
-const device_type NES_KS7032 = &device_creator<nes_ks7032_device>;
-const device_type NES_KS202 = &device_creator<nes_ks202_device>;
-const device_type NES_KS7017 = &device_creator<nes_ks7017_device>;
-const device_type NES_KS7012 = &device_creator<nes_ks7012_device>;
-const device_type NES_KS7013B = &device_creator<nes_ks7013b_device>;
-const device_type NES_KS7031 = &device_creator<nes_ks7031_device>;
-const device_type NES_KS7016 = &device_creator<nes_ks7016_device>;
-const device_type NES_KS7037 = &device_creator<nes_ks7037_device>;
+const device_type NES_KS7058 = device_creator<nes_ks7058_device>;
+const device_type NES_KS7022 = device_creator<nes_ks7022_device>;
+const device_type NES_KS7032 = device_creator<nes_ks7032_device>;
+const device_type NES_KS202 = device_creator<nes_ks202_device>;
+const device_type NES_KS7017 = device_creator<nes_ks7017_device>;
+const device_type NES_KS7012 = device_creator<nes_ks7012_device>;
+const device_type NES_KS7013B = device_creator<nes_ks7013b_device>;
+const device_type NES_KS7031 = device_creator<nes_ks7031_device>;
+const device_type NES_KS7016 = device_creator<nes_ks7016_device>;
+const device_type NES_KS7037 = device_creator<nes_ks7037_device>;
nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp
index 74c9704c766..8e78ee20e75 100644
--- a/src/devices/bus/nes/karastudio.cpp
+++ b/src/devices/bus/nes/karastudio.cpp
@@ -69,7 +69,7 @@ READ8_MEMBER(kstudio_cart_interface::read)
// sub-cart slot device
//-------------------------------------------------
-const device_type NES_KSEXPANSION_SLOT = &device_creator<nes_kstudio_slot_device>;
+const device_type NES_KSEXPANSION_SLOT = device_creator<nes_kstudio_slot_device>;
nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__),
@@ -142,7 +142,7 @@ ROM_START( ks_exp_rom )
ROM_REGION(0x20000, "exrom", ROMREGION_ERASEFF)
ROM_END
-const device_type NES_KSEXPANSION_ROM = &device_creator<nes_kstudio_rom_device>;
+const device_type NES_KSEXPANSION_ROM = device_creator<nes_kstudio_rom_device>;
nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_KSEXPANSION_ROM, "NES Karaoke Studio Expansion ROM", tag, owner, clock, "nes_ks_rom", __FILE__),
@@ -178,7 +178,7 @@ uint8_t *nes_kstudio_rom_device::get_cart_base()
//
//------------------------------------------
-const device_type NES_KARAOKESTUDIO = &device_creator<nes_karaokestudio_device>;
+const device_type NES_KARAOKESTUDIO = device_creator<nes_karaokestudio_device>;
nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index a7565d5af96..e807b813091 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -28,6 +28,8 @@
#include "konami.h"
#include "cpu/m6502/m6502.h"
+#include "speaker.h"
+
#ifdef NES_PCB_DEBUG
#define VERBOSE 1
@@ -43,12 +45,12 @@
// constructor
//-------------------------------------------------
-const device_type NES_VRC1 = &device_creator<nes_konami_vrc1_device>;
-const device_type NES_VRC2 = &device_creator<nes_konami_vrc2_device>;
-const device_type NES_VRC3 = &device_creator<nes_konami_vrc3_device>;
-const device_type NES_VRC4 = &device_creator<nes_konami_vrc4_device>;
-const device_type NES_VRC6 = &device_creator<nes_konami_vrc6_device>;
-const device_type NES_VRC7 = &device_creator<nes_konami_vrc7_device>;
+const device_type NES_VRC1 = device_creator<nes_konami_vrc1_device>;
+const device_type NES_VRC2 = device_creator<nes_konami_vrc2_device>;
+const device_type NES_VRC3 = device_creator<nes_konami_vrc3_device>;
+const device_type NES_VRC4 = device_creator<nes_konami_vrc4_device>;
+const device_type NES_VRC6 = device_creator<nes_konami_vrc6_device>;
+const device_type NES_VRC7 = device_creator<nes_konami_vrc7_device>;
nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp
index 888a5077146..c5342004351 100644
--- a/src/devices/bus/nes/legacy.cpp
+++ b/src/devices/bus/nes/legacy.cpp
@@ -34,9 +34,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_FFE3 = &device_creator<nes_ffe3_device>;
-const device_type NES_FFE4 = &device_creator<nes_ffe4_device>;
-const device_type NES_FFE8 = &device_creator<nes_ffe8_device>;
+const device_type NES_FFE3 = device_creator<nes_ffe3_device>;
+const device_type NES_FFE4 = device_creator<nes_ffe4_device>;
+const device_type NES_FFE8 = device_creator<nes_ffe8_device>;
nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp
index 983fb5bfcb8..fe1680116af 100644
--- a/src/devices/bus/nes/mmc1.cpp
+++ b/src/devices/bus/nes/mmc1.cpp
@@ -32,10 +32,10 @@
// constructor
//-------------------------------------------------
-const device_type NES_SXROM = &device_creator<nes_sxrom_device>;
-const device_type NES_SOROM = &device_creator<nes_sorom_device>;
-const device_type NES_SXROM_A = &device_creator<nes_sxrom_a_device>;
-const device_type NES_SOROM_A = &device_creator<nes_sorom_a_device>;
+const device_type NES_SXROM = device_creator<nes_sxrom_device>;
+const device_type NES_SOROM = device_creator<nes_sorom_device>;
+const device_type NES_SXROM_A = device_creator<nes_sxrom_a_device>;
+const device_type NES_SOROM_A = device_creator<nes_sorom_a_device>;
diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp
index 1fedbab04df..d1871483a68 100644
--- a/src/devices/bus/nes/mmc2.cpp
+++ b/src/devices/bus/nes/mmc2.cpp
@@ -28,8 +28,8 @@
// constructor
//-------------------------------------------------
-const device_type NES_PXROM = &device_creator<nes_pxrom_device>;
-const device_type NES_FXROM = &device_creator<nes_fxrom_device>;
+const device_type NES_PXROM = device_creator<nes_pxrom_device>;
+const device_type NES_FXROM = device_creator<nes_fxrom_device>;
nes_pxrom_device::nes_pxrom_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)
diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp
index 1357ceb119b..75aa036d39b 100644
--- a/src/devices/bus/nes/mmc3.cpp
+++ b/src/devices/bus/nes/mmc3.cpp
@@ -30,6 +30,7 @@
#include "cpu/m6502/m6502.h"
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE
+#include "screen.h"
#ifdef NES_PCB_DEBUG
@@ -45,12 +46,12 @@
// constructor
//-------------------------------------------------
-const device_type NES_TXROM = &device_creator<nes_txrom_device>;
-const device_type NES_HKROM = &device_creator<nes_hkrom_device>;
-const device_type NES_TXSROM = &device_creator<nes_txsrom_device>;
-const device_type NES_TQROM = &device_creator<nes_tqrom_device>;
-const device_type NES_QJ_PCB = &device_creator<nes_qj_device>;
-const device_type NES_ZZ_PCB = &device_creator<nes_zz_device>;
+const device_type NES_TXROM = device_creator<nes_txrom_device>;
+const device_type NES_HKROM = device_creator<nes_hkrom_device>;
+const device_type NES_TXSROM = device_creator<nes_txsrom_device>;
+const device_type NES_TQROM = device_creator<nes_tqrom_device>;
+const device_type NES_QJ_PCB = device_creator<nes_qj_device>;
+const device_type NES_ZZ_PCB = device_creator<nes_zz_device>;
nes_txrom_device::nes_txrom_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)
diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp
index b9866c1e63e..1485e6411ce 100644
--- a/src/devices/bus/nes/mmc3_clones.cpp
+++ b/src/devices/bus/nes/mmc3_clones.cpp
@@ -28,42 +28,42 @@
// constructor
//-------------------------------------------------
-const device_type NES_NITRA = &device_creator<nes_nitra_device>;
-const device_type NES_KS7057 = &device_creator<nes_ks7057_device>;
-const device_type NES_SBROS11 = &device_creator<nes_sbros11_device>;
-const device_type NES_MALISB = &device_creator<nes_malisb_device>;
-const device_type NES_FAMILY4646 = &device_creator<nes_family4646_device>;
-const device_type NES_PIKAY2K = &device_creator<nes_pikay2k_device>;
-const device_type NES_8237 = &device_creator<nes_8237_device>;
-const device_type NES_SG_LIONK = &device_creator<nes_sglionk_device>;
-const device_type NES_SG_BOOG = &device_creator<nes_sgboog_device>;
-const device_type NES_KASING = &device_creator<nes_kasing_device>;
-const device_type NES_KAY = &device_creator<nes_kay_device>;
-const device_type NES_H2288 = &device_creator<nes_h2288_device>;
-const device_type NES_6035052 = &device_creator<nes_6035052_device>;
-const device_type NES_TXC_TW = &device_creator<nes_txc_tw_device>;
-const device_type NES_KOF97 = &device_creator<nes_kof97_device>;
-const device_type NES_KOF96 = &device_creator<nes_kof96_device>;
-const device_type NES_SF3 = &device_creator<nes_sf3_device>;
-const device_type NES_GOUDER = &device_creator<nes_gouder_device>;
-const device_type NES_SA9602B = &device_creator<nes_sa9602b_device>;
-const device_type NES_SACHEN_SHERO = &device_creator<nes_sachen_shero_device>;
-//const device_type NES_A9746 = &device_creator<nes_a9746_device>;
-
-const device_type NES_FK23C = &device_creator<nes_fk23c_device>;
-const device_type NES_FK23CA = &device_creator<nes_fk23ca_device>;
-const device_type NES_S24IN1SC03 = &device_creator<nes_s24in1sc03_device>;
-const device_type NES_BMC_15IN1 = &device_creator<nes_bmc_15in1_device>;
-const device_type NES_BMC_SBIG7 = &device_creator<nes_bmc_sbig7_device>;
-const device_type NES_BMC_HIK8 = &device_creator<nes_bmc_hik8_device>;
-const device_type NES_BMC_HIK4 = &device_creator<nes_bmc_hik4_device>;
-const device_type NES_BMC_MARIO7IN1 = &device_creator<nes_bmc_mario7in1_device>;
-const device_type NES_BMC_GOLD7IN1 = &device_creator<nes_bmc_gold7in1_device>;
-const device_type NES_BMC_GC6IN1 = &device_creator<nes_bmc_gc6in1_device>;
-const device_type NES_BMC_411120C = &device_creator<nes_bmc_411120c_device>;
-const device_type NES_BMC_830118C = &device_creator<nes_bmc_830118c_device>;
-const device_type NES_PJOY84 = &device_creator<nes_pjoy84_device>;
-const device_type NES_COOLBOY = &device_creator<nes_coolboy_device>;
+const device_type NES_NITRA = device_creator<nes_nitra_device>;
+const device_type NES_KS7057 = device_creator<nes_ks7057_device>;
+const device_type NES_SBROS11 = device_creator<nes_sbros11_device>;
+const device_type NES_MALISB = device_creator<nes_malisb_device>;
+const device_type NES_FAMILY4646 = device_creator<nes_family4646_device>;
+const device_type NES_PIKAY2K = device_creator<nes_pikay2k_device>;
+const device_type NES_8237 = device_creator<nes_8237_device>;
+const device_type NES_SG_LIONK = device_creator<nes_sglionk_device>;
+const device_type NES_SG_BOOG = device_creator<nes_sgboog_device>;
+const device_type NES_KASING = device_creator<nes_kasing_device>;
+const device_type NES_KAY = device_creator<nes_kay_device>;
+const device_type NES_H2288 = device_creator<nes_h2288_device>;
+const device_type NES_6035052 = device_creator<nes_6035052_device>;
+const device_type NES_TXC_TW = device_creator<nes_txc_tw_device>;
+const device_type NES_KOF97 = device_creator<nes_kof97_device>;
+const device_type NES_KOF96 = device_creator<nes_kof96_device>;
+const device_type NES_SF3 = device_creator<nes_sf3_device>;
+const device_type NES_GOUDER = device_creator<nes_gouder_device>;
+const device_type NES_SA9602B = device_creator<nes_sa9602b_device>;
+const device_type NES_SACHEN_SHERO = device_creator<nes_sachen_shero_device>;
+//const device_type NES_A9746 = device_creator<nes_a9746_device>;
+
+const device_type NES_FK23C = device_creator<nes_fk23c_device>;
+const device_type NES_FK23CA = device_creator<nes_fk23ca_device>;
+const device_type NES_S24IN1SC03 = device_creator<nes_s24in1sc03_device>;
+const device_type NES_BMC_15IN1 = device_creator<nes_bmc_15in1_device>;
+const device_type NES_BMC_SBIG7 = device_creator<nes_bmc_sbig7_device>;
+const device_type NES_BMC_HIK8 = device_creator<nes_bmc_hik8_device>;
+const device_type NES_BMC_HIK4 = device_creator<nes_bmc_hik4_device>;
+const device_type NES_BMC_MARIO7IN1 = device_creator<nes_bmc_mario7in1_device>;
+const device_type NES_BMC_GOLD7IN1 = device_creator<nes_bmc_gold7in1_device>;
+const device_type NES_BMC_GC6IN1 = device_creator<nes_bmc_gc6in1_device>;
+const device_type NES_BMC_411120C = device_creator<nes_bmc_411120c_device>;
+const device_type NES_BMC_830118C = device_creator<nes_bmc_830118c_device>;
+const device_type NES_PJOY84 = device_creator<nes_pjoy84_device>;
+const device_type NES_COOLBOY = device_creator<nes_coolboy_device>;
nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp
index 239fbe633cf..ff0f382626b 100644
--- a/src/devices/bus/nes/mmc5.cpp
+++ b/src/devices/bus/nes/mmc5.cpp
@@ -41,7 +41,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff};
// constructor
//-------------------------------------------------
-const device_type NES_EXROM = &device_creator<nes_exrom_device>;
+const device_type NES_EXROM = device_creator<nes_exrom_device>;
nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp
index 52ae1baccbe..0f01641de1a 100644
--- a/src/devices/bus/nes/multigame.cpp
+++ b/src/devices/bus/nes/multigame.cpp
@@ -28,53 +28,53 @@
// constructor
//-------------------------------------------------
-const device_type NES_ACTION52 = &device_creator<nes_action52_device>;
-const device_type NES_CALTRON6IN1 = &device_creator<nes_caltron_device>;
-const device_type NES_RUMBLESTATION = &device_creator<nes_rumblestat_device>;
-const device_type NES_SVISION16 = &device_creator<nes_svision16_device>;
-const device_type NES_N625092 = &device_creator<nes_n625092_device>;
-const device_type NES_A65AS = &device_creator<nes_a65as_device>;
-const device_type NES_T262 = &device_creator<nes_t262_device>;
-const device_type NES_NOVEL1 = &device_creator<nes_novel1_device>;
-const device_type NES_NOVEL2 = &device_creator<nes_novel2_device>;
-const device_type NES_STUDYNGAME = &device_creator<nes_studyngame_device>;
-const device_type NES_SUPERGUN20IN1 = &device_creator<nes_sgun20in1_device>;
-const device_type NES_VT5201 = &device_creator<nes_vt5201_device>;
-const device_type NES_810544C = &device_creator<nes_810544c_device>;
-const device_type NES_NTD03 = &device_creator<nes_ntd03_device>;
-const device_type NES_BMC_GB63 = &device_creator<nes_bmc_gb63_device>;
-const device_type NES_BMC_GKA = &device_creator<nes_bmc_gka_device>;
-const device_type NES_BMC_GKB = &device_creator<nes_bmc_gkb_device>;
-const device_type NES_BMC_WS = &device_creator<nes_bmc_ws_device>;
-const device_type NES_BMC_11160 = &device_creator<nes_bmc_11160_device>;
-const device_type NES_BMC_G146 = &device_creator<nes_bmc_g146_device>;
-const device_type NES_BMC_8157 = &device_creator<nes_bmc_8157_device>;
-const device_type NES_BMC_HIK300 = &device_creator<nes_bmc_hik300_device>;
-const device_type NES_BMC_S700 = &device_creator<nes_bmc_s700_device>;
-const device_type NES_BMC_BALL11 = &device_creator<nes_bmc_ball11_device>;
-const device_type NES_BMC_22GAMES = &device_creator<nes_bmc_22games_device>;
-const device_type NES_BMC_64Y2K = &device_creator<nes_bmc_64y2k_device>;
-const device_type NES_BMC_12IN1 = &device_creator<nes_bmc_12in1_device>;
-const device_type NES_BMC_20IN1 = &device_creator<nes_bmc_20in1_device>;
-const device_type NES_BMC_21IN1 = &device_creator<nes_bmc_21in1_device>;
-const device_type NES_BMC_31IN1 = &device_creator<nes_bmc_31in1_device>;
-const device_type NES_BMC_35IN1 = &device_creator<nes_bmc_35in1_device>;
-const device_type NES_BMC_36IN1 = &device_creator<nes_bmc_36in1_device>;
-const device_type NES_BMC_64IN1 = &device_creator<nes_bmc_64in1_device>;
-const device_type NES_BMC_70IN1 = &device_creator<nes_bmc_70in1_device>;
-const device_type NES_BMC_72IN1 = &device_creator<nes_bmc_72in1_device>;
-const device_type NES_BMC_76IN1 = &device_creator<nes_bmc_76in1_device>;
-const device_type NES_BMC_110IN1 = &device_creator<nes_bmc_110in1_device>;
-const device_type NES_BMC_150IN1 = &device_creator<nes_bmc_150in1_device>;
-const device_type NES_BMC_190IN1 = &device_creator<nes_bmc_190in1_device>;
-const device_type NES_BMC_800IN1 = &device_creator<nes_bmc_800in1_device>;
-const device_type NES_BMC_1200IN1 = &device_creator<nes_bmc_1200in1_device>;
-const device_type NES_BMC_GOLD150 = &device_creator<nes_bmc_gold150_device>;
-const device_type NES_BMC_GOLD260 = &device_creator<nes_bmc_gold260_device>;
-const device_type NES_BMC_CH001 = &device_creator<nes_bmc_ch001_device>;
-const device_type NES_BMC_SUPER22 = &device_creator<nes_bmc_super22_device>;
-const device_type NES_BMC_4IN1RESET = &device_creator<nes_bmc_4in1reset_device>;
-const device_type NES_BMC_42IN1RESET = &device_creator<nes_bmc_42in1reset_device>;
+const device_type NES_ACTION52 = device_creator<nes_action52_device>;
+const device_type NES_CALTRON6IN1 = device_creator<nes_caltron_device>;
+const device_type NES_RUMBLESTATION = device_creator<nes_rumblestat_device>;
+const device_type NES_SVISION16 = device_creator<nes_svision16_device>;
+const device_type NES_N625092 = device_creator<nes_n625092_device>;
+const device_type NES_A65AS = device_creator<nes_a65as_device>;
+const device_type NES_T262 = device_creator<nes_t262_device>;
+const device_type NES_NOVEL1 = device_creator<nes_novel1_device>;
+const device_type NES_NOVEL2 = device_creator<nes_novel2_device>;
+const device_type NES_STUDYNGAME = device_creator<nes_studyngame_device>;
+const device_type NES_SUPERGUN20IN1 = device_creator<nes_sgun20in1_device>;
+const device_type NES_VT5201 = device_creator<nes_vt5201_device>;
+const device_type NES_810544C = device_creator<nes_810544c_device>;
+const device_type NES_NTD03 = device_creator<nes_ntd03_device>;
+const device_type NES_BMC_GB63 = device_creator<nes_bmc_gb63_device>;
+const device_type NES_BMC_GKA = device_creator<nes_bmc_gka_device>;
+const device_type NES_BMC_GKB = device_creator<nes_bmc_gkb_device>;
+const device_type NES_BMC_WS = device_creator<nes_bmc_ws_device>;
+const device_type NES_BMC_11160 = device_creator<nes_bmc_11160_device>;
+const device_type NES_BMC_G146 = device_creator<nes_bmc_g146_device>;
+const device_type NES_BMC_8157 = device_creator<nes_bmc_8157_device>;
+const device_type NES_BMC_HIK300 = device_creator<nes_bmc_hik300_device>;
+const device_type NES_BMC_S700 = device_creator<nes_bmc_s700_device>;
+const device_type NES_BMC_BALL11 = device_creator<nes_bmc_ball11_device>;
+const device_type NES_BMC_22GAMES = device_creator<nes_bmc_22games_device>;
+const device_type NES_BMC_64Y2K = device_creator<nes_bmc_64y2k_device>;
+const device_type NES_BMC_12IN1 = device_creator<nes_bmc_12in1_device>;
+const device_type NES_BMC_20IN1 = device_creator<nes_bmc_20in1_device>;
+const device_type NES_BMC_21IN1 = device_creator<nes_bmc_21in1_device>;
+const device_type NES_BMC_31IN1 = device_creator<nes_bmc_31in1_device>;
+const device_type NES_BMC_35IN1 = device_creator<nes_bmc_35in1_device>;
+const device_type NES_BMC_36IN1 = device_creator<nes_bmc_36in1_device>;
+const device_type NES_BMC_64IN1 = device_creator<nes_bmc_64in1_device>;
+const device_type NES_BMC_70IN1 = device_creator<nes_bmc_70in1_device>;
+const device_type NES_BMC_72IN1 = device_creator<nes_bmc_72in1_device>;
+const device_type NES_BMC_76IN1 = device_creator<nes_bmc_76in1_device>;
+const device_type NES_BMC_110IN1 = device_creator<nes_bmc_110in1_device>;
+const device_type NES_BMC_150IN1 = device_creator<nes_bmc_150in1_device>;
+const device_type NES_BMC_190IN1 = device_creator<nes_bmc_190in1_device>;
+const device_type NES_BMC_800IN1 = device_creator<nes_bmc_800in1_device>;
+const device_type NES_BMC_1200IN1 = device_creator<nes_bmc_1200in1_device>;
+const device_type NES_BMC_GOLD150 = device_creator<nes_bmc_gold150_device>;
+const device_type NES_BMC_GOLD260 = device_creator<nes_bmc_gold260_device>;
+const device_type NES_BMC_CH001 = device_creator<nes_bmc_ch001_device>;
+const device_type NES_BMC_SUPER22 = device_creator<nes_bmc_super22_device>;
+const device_type NES_BMC_4IN1RESET = device_creator<nes_bmc_4in1reset_device>;
+const device_type NES_BMC_42IN1RESET = device_creator<nes_bmc_42in1reset_device>;
nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp
index e65f15906be..8b443efcbd2 100644
--- a/src/devices/bus/nes/namcot.cpp
+++ b/src/devices/bus/nes/namcot.cpp
@@ -41,12 +41,12 @@
// constructor
//-------------------------------------------------
-const device_type NES_NAMCOT3433 = &device_creator<nes_namcot3433_device>;
-const device_type NES_NAMCOT3446 = &device_creator<nes_namcot3446_device>;
-const device_type NES_NAMCOT3425 = &device_creator<nes_namcot3425_device>;
-const device_type NES_NAMCOT175 = &device_creator<nes_namcot175_device>;
-const device_type NES_NAMCOT340 = &device_creator<nes_namcot340_device>;
-const device_type NES_NAMCOT163 = &device_creator<nes_namcot163_device>;
+const device_type NES_NAMCOT3433 = device_creator<nes_namcot3433_device>;
+const device_type NES_NAMCOT3446 = device_creator<nes_namcot3446_device>;
+const device_type NES_NAMCOT3425 = device_creator<nes_namcot3425_device>;
+const device_type NES_NAMCOT175 = device_creator<nes_namcot175_device>;
+const device_type NES_NAMCOT340 = device_creator<nes_namcot340_device>;
+const device_type NES_NAMCOT163 = device_creator<nes_namcot163_device>;
nes_namcot3433_device::nes_namcot3433_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)
diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp
index 8163cb7e156..8acc871f81c 100644
--- a/src/devices/bus/nes/nanjing.cpp
+++ b/src/devices/bus/nes/nanjing.cpp
@@ -30,7 +30,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_NANJING = &device_creator<nes_nanjing_device>;
+const device_type NES_NANJING = device_creator<nes_nanjing_device>;
nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp
index d2cf5491d69..9832b2265ed 100644
--- a/src/devices/bus/nes/nes_slot.cpp
+++ b/src/devices/bus/nes/nes_slot.cpp
@@ -93,7 +93,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NES_CART_SLOT = &device_creator<nes_cart_slot_device>;
+const device_type NES_CART_SLOT = device_creator<nes_cart_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp
index 2e75216664d..a2547a97185 100644
--- a/src/devices/bus/nes/ntdec.cpp
+++ b/src/devices/bus/nes/ntdec.cpp
@@ -34,8 +34,8 @@
// constructor
//-------------------------------------------------
-const device_type NES_NTDEC_ASDER = &device_creator<nes_ntdec_asder_device>;
-const device_type NES_NTDEC_FH = &device_creator<nes_ntdec_fh_device>;
+const device_type NES_NTDEC_ASDER = device_creator<nes_ntdec_asder_device>;
+const device_type NES_NTDEC_FH = device_creator<nes_ntdec_fh_device>;
nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp
index 4af56430356..6996fe50faa 100644
--- a/src/devices/bus/nes/nxrom.cpp
+++ b/src/devices/bus/nes/nxrom.cpp
@@ -45,18 +45,18 @@
// constructor
//-------------------------------------------------
-const device_type NES_NROM = &device_creator<nes_nrom_device>;
-const device_type NES_NROM368 = &device_creator<nes_nrom368_device>;
-const device_type NES_FCBASIC = &device_creator<nes_fcbasic_device>;
-const device_type NES_AXROM = &device_creator<nes_axrom_device>;
-const device_type NES_BXROM = &device_creator<nes_bxrom_device>;
-const device_type NES_CNROM = &device_creator<nes_cnrom_device>;
-const device_type NES_CPROM = &device_creator<nes_cprom_device>;
-const device_type NES_GXROM = &device_creator<nes_gxrom_device>;
-const device_type NES_UXROM = &device_creator<nes_uxrom_device>;
-const device_type NES_UXROM_CC = &device_creator<nes_uxrom_cc_device>;
-const device_type NES_UN1ROM = &device_creator<nes_un1rom_device>;
-const device_type NES_NOCHR = &device_creator<nes_nochr_device>;
+const device_type NES_NROM = device_creator<nes_nrom_device>;
+const device_type NES_NROM368 = device_creator<nes_nrom368_device>;
+const device_type NES_FCBASIC = device_creator<nes_fcbasic_device>;
+const device_type NES_AXROM = device_creator<nes_axrom_device>;
+const device_type NES_BXROM = device_creator<nes_bxrom_device>;
+const device_type NES_CNROM = device_creator<nes_cnrom_device>;
+const device_type NES_CPROM = device_creator<nes_cprom_device>;
+const device_type NES_GXROM = device_creator<nes_gxrom_device>;
+const device_type NES_UXROM = device_creator<nes_uxrom_device>;
+const device_type NES_UXROM_CC = device_creator<nes_uxrom_cc_device>;
+const device_type NES_UN1ROM = device_creator<nes_un1rom_device>;
+const device_type NES_NOCHR = device_creator<nes_nochr_device>;
nes_nrom_device::nes_nrom_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)
diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp
index 69e6117b977..7dc16f516a3 100644
--- a/src/devices/bus/nes/pirate.cpp
+++ b/src/devices/bus/nes/pirate.cpp
@@ -19,6 +19,7 @@
#include "cpu/m6502/m6502.h"
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE
+#include "screen.h"
#ifdef NES_PCB_DEBUG
@@ -34,23 +35,23 @@
// constructor
//-------------------------------------------------
-const device_type NES_AGCI_50282 = &device_creator<nes_agci_device>;
-const device_type NES_DREAMTECH01 = &device_creator<nes_dreamtech_device>;
-const device_type NES_FUKUTAKE = &device_creator<nes_fukutake_device>;
-const device_type NES_FUTUREMEDIA = &device_creator<nes_futuremedia_device>;
-const device_type NES_MAGSERIES = &device_creator<nes_magseries_device>;
-const device_type NES_DAOU306 = &device_creator<nes_daou306_device>;
-const device_type NES_SUBOR0 = &device_creator<nes_subor0_device>;
-const device_type NES_SUBOR1 = &device_creator<nes_subor1_device>;
-const device_type NES_CC21 = &device_creator<nes_cc21_device>;
-const device_type NES_XIAOZY = &device_creator<nes_xiaozy_device>;
-const device_type NES_EDU2K = &device_creator<nes_edu2k_device>;
-const device_type NES_T230 = &device_creator<nes_t230_device>;
-const device_type NES_MK2 = &device_creator<nes_mk2_device>;
-const device_type NES_WHERO = &device_creator<nes_whero_device>;
-const device_type NES_43272 = &device_creator<nes_43272_device>;
-const device_type NES_TF1201 = &device_creator<nes_tf1201_device>;
-const device_type NES_CITYFIGHT = &device_creator<nes_cityfight_device>;
+const device_type NES_AGCI_50282 = device_creator<nes_agci_device>;
+const device_type NES_DREAMTECH01 = device_creator<nes_dreamtech_device>;
+const device_type NES_FUKUTAKE = device_creator<nes_fukutake_device>;
+const device_type NES_FUTUREMEDIA = device_creator<nes_futuremedia_device>;
+const device_type NES_MAGSERIES = device_creator<nes_magseries_device>;
+const device_type NES_DAOU306 = device_creator<nes_daou306_device>;
+const device_type NES_SUBOR0 = device_creator<nes_subor0_device>;
+const device_type NES_SUBOR1 = device_creator<nes_subor1_device>;
+const device_type NES_CC21 = device_creator<nes_cc21_device>;
+const device_type NES_XIAOZY = device_creator<nes_xiaozy_device>;
+const device_type NES_EDU2K = device_creator<nes_edu2k_device>;
+const device_type NES_T230 = device_creator<nes_t230_device>;
+const device_type NES_MK2 = device_creator<nes_mk2_device>;
+const device_type NES_WHERO = device_creator<nes_whero_device>;
+const device_type NES_43272 = device_creator<nes_43272_device>;
+const device_type NES_TF1201 = device_creator<nes_tf1201_device>;
+const device_type NES_CITYFIGHT = device_creator<nes_cityfight_device>;
nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp
index 2794a78a55e..a12d3e63145 100644
--- a/src/devices/bus/nes/pt554.cpp
+++ b/src/devices/bus/nes/pt554.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "pt554.h"
+#include "speaker.h"
#ifdef NES_PCB_DEBUG
@@ -31,7 +32,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_BANDAI_PT554 = &device_creator<nes_bandai_pt554_device>;
+const device_type NES_BANDAI_PT554 = device_creator<nes_bandai_pt554_device>;
nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp
index f56733d2127..680433e4ed4 100644
--- a/src/devices/bus/nes/racermate.cpp
+++ b/src/devices/bus/nes/racermate.cpp
@@ -32,7 +32,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_RACERMATE = &device_creator<nes_racermate_device>;
+const device_type NES_RACERMATE = device_creator<nes_racermate_device>;
nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp
index 30f867cb39b..aedda67cc46 100644
--- a/src/devices/bus/nes/rcm.cpp
+++ b/src/devices/bus/nes/rcm.cpp
@@ -39,11 +39,11 @@
// constructor
//-------------------------------------------------
-const device_type NES_GS2015 = &device_creator<nes_gs2015_device>;
-const device_type NES_GS2004 = &device_creator<nes_gs2004_device>;
-const device_type NES_GS2013 = &device_creator<nes_gs2013_device>;
-const device_type NES_TF9IN1 = &device_creator<nes_tf9_device>;
-const device_type NES_3DBLOCK = &device_creator<nes_3dblock_device>;
+const device_type NES_GS2015 = device_creator<nes_gs2015_device>;
+const device_type NES_GS2004 = device_creator<nes_gs2004_device>;
+const device_type NES_GS2013 = device_creator<nes_gs2013_device>;
+const device_type NES_TF9IN1 = device_creator<nes_tf9_device>;
+const device_type NES_3DBLOCK = device_creator<nes_3dblock_device>;
nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp
index de49c5d9af9..9aaaed7721b 100644
--- a/src/devices/bus/nes/rexsoft.cpp
+++ b/src/devices/bus/nes/rexsoft.cpp
@@ -35,8 +35,8 @@
// constructor
//-------------------------------------------------
-const device_type NES_REX_DBZ5 = &device_creator<nes_rex_dbz5_device>;
-const device_type NES_REX_SL1632 = &device_creator<nes_rex_sl1632_device>;
+const device_type NES_REX_DBZ5 = device_creator<nes_rex_dbz5_device>;
+const device_type NES_REX_SL1632 = device_creator<nes_rex_sl1632_device>;
nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp
index e000b23216e..317f2e7e78c 100644
--- a/src/devices/bus/nes/sachen.cpp
+++ b/src/devices/bus/nes/sachen.cpp
@@ -44,20 +44,20 @@
// constructor
//-------------------------------------------------
-const device_type NES_SACHEN_SA009 = &device_creator<nes_sachen_sa009_device>;
-const device_type NES_SACHEN_SA0036 = &device_creator<nes_sachen_sa0036_device>;
-const device_type NES_SACHEN_SA0037 = &device_creator<nes_sachen_sa0037_device>;
-const device_type NES_SACHEN_SA72007 = &device_creator<nes_sachen_sa72007_device>;
-const device_type NES_SACHEN_SA72008 = &device_creator<nes_sachen_sa72008_device>;
-const device_type NES_SACHEN_TCA01 = &device_creator<nes_sachen_tca01_device>;
-const device_type NES_SACHEN_TCU01 = &device_creator<nes_sachen_tcu01_device>;
-const device_type NES_SACHEN_TCU02 = &device_creator<nes_sachen_tcu02_device>;
-const device_type NES_SACHEN_74X374 = &device_creator<nes_sachen_74x374_device>;
-const device_type NES_SACHEN_74X374_ALT = &device_creator<nes_sachen_74x374_alt_device>;
-const device_type NES_SACHEN_8259A = &device_creator<nes_sachen_8259a_device>;
-const device_type NES_SACHEN_8259B = &device_creator<nes_sachen_8259b_device>;
-const device_type NES_SACHEN_8259C = &device_creator<nes_sachen_8259c_device>;
-const device_type NES_SACHEN_8259D = &device_creator<nes_sachen_8259d_device>;
+const device_type NES_SACHEN_SA009 = device_creator<nes_sachen_sa009_device>;
+const device_type NES_SACHEN_SA0036 = device_creator<nes_sachen_sa0036_device>;
+const device_type NES_SACHEN_SA0037 = device_creator<nes_sachen_sa0037_device>;
+const device_type NES_SACHEN_SA72007 = device_creator<nes_sachen_sa72007_device>;
+const device_type NES_SACHEN_SA72008 = device_creator<nes_sachen_sa72008_device>;
+const device_type NES_SACHEN_TCA01 = device_creator<nes_sachen_tca01_device>;
+const device_type NES_SACHEN_TCU01 = device_creator<nes_sachen_tcu01_device>;
+const device_type NES_SACHEN_TCU02 = device_creator<nes_sachen_tcu02_device>;
+const device_type NES_SACHEN_74X374 = device_creator<nes_sachen_74x374_device>;
+const device_type NES_SACHEN_74X374_ALT = device_creator<nes_sachen_74x374_alt_device>;
+const device_type NES_SACHEN_8259A = device_creator<nes_sachen_8259a_device>;
+const device_type NES_SACHEN_8259B = device_creator<nes_sachen_8259b_device>;
+const device_type NES_SACHEN_8259C = device_creator<nes_sachen_8259c_device>;
+const device_type NES_SACHEN_8259D = device_creator<nes_sachen_8259d_device>;
nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp
index 9990ae8d9db..b1f172567fe 100644
--- a/src/devices/bus/nes/somari.cpp
+++ b/src/devices/bus/nes/somari.cpp
@@ -36,7 +36,7 @@
// constructor
//-------------------------------------------------
-const device_type NES_SOMARI = &device_creator<nes_somari_device>;
+const device_type NES_SOMARI = device_creator<nes_somari_device>;
nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index 133bdcf2858..bf35510946e 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -26,6 +26,8 @@
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#ifdef NES_PCB_DEBUG
#define VERBOSE 1
@@ -40,12 +42,12 @@
// constructor
//-------------------------------------------------
-const device_type NES_SUNSOFT_1 = &device_creator<nes_sunsoft_1_device>;
-const device_type NES_SUNSOFT_2 = &device_creator<nes_sunsoft_2_device>;
-const device_type NES_SUNSOFT_3 = &device_creator<nes_sunsoft_3_device>;
-const device_type NES_SUNSOFT_4 = &device_creator<nes_sunsoft_4_device>;
-const device_type NES_SUNSOFT_FME7 = &device_creator<nes_sunsoft_fme7_device>;
-const device_type NES_SUNSOFT_5 = &device_creator<nes_sunsoft_5_device>;
+const device_type NES_SUNSOFT_1 = device_creator<nes_sunsoft_1_device>;
+const device_type NES_SUNSOFT_2 = device_creator<nes_sunsoft_2_device>;
+const device_type NES_SUNSOFT_3 = device_creator<nes_sunsoft_3_device>;
+const device_type NES_SUNSOFT_4 = device_creator<nes_sunsoft_4_device>;
+const device_type NES_SUNSOFT_FME7 = device_creator<nes_sunsoft_fme7_device>;
+const device_type NES_SUNSOFT_5 = device_creator<nes_sunsoft_5_device>;
nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp
index 0ad26e2374e..0a960b5d1d8 100644
--- a/src/devices/bus/nes/sunsoft_dcs.cpp
+++ b/src/devices/bus/nes/sunsoft_dcs.cpp
@@ -48,7 +48,7 @@ ntb_cart_interface::~ntb_cart_interface()
// sub-cart slot device
//-------------------------------------------------
-const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>;
+const device_type NES_NTB_SLOT = device_creator<nes_ntb_slot_device>;
nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__),
@@ -120,7 +120,7 @@ ROM_START( ntb_rom )
ROM_REGION(0x4000, "ntbrom", ROMREGION_ERASEFF)
ROM_END
-const device_type NES_NTB_ROM = &device_creator<nes_ntb_rom_device>;
+const device_type NES_NTB_ROM = device_creator<nes_ntb_rom_device>;
nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_NTB_ROM, "NES NTB ROM", tag, owner, clock, "nes_ntbrom", __FILE__),
@@ -153,7 +153,7 @@ uint8_t *nes_ntb_rom_device::get_cart_base()
//
//------------------------------------------------
-const device_type NES_SUNSOFT_DCS = &device_creator<nes_sunsoft_dcs_device>;
+const device_type NES_SUNSOFT_DCS = device_creator<nes_sunsoft_dcs_device>;
nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp
index 38f156080ae..b417f6dcc3a 100644
--- a/src/devices/bus/nes/taito.cpp
+++ b/src/devices/bus/nes/taito.cpp
@@ -41,10 +41,10 @@
// constructor
//-------------------------------------------------
-const device_type NES_TC0190FMC = &device_creator<nes_tc0190fmc_device>;
-const device_type NES_TC0190FMC_PAL16R4 = &device_creator<nes_tc0190fmc_pal16r4_device>;
-const device_type NES_X1_005 = &device_creator<nes_x1_005_device>;
-const device_type NES_X1_017 = &device_creator<nes_x1_017_device>;
+const device_type NES_TC0190FMC = device_creator<nes_tc0190fmc_device>;
+const device_type NES_TC0190FMC_PAL16R4 = device_creator<nes_tc0190fmc_pal16r4_device>;
+const device_type NES_X1_005 = device_creator<nes_x1_005_device>;
+const device_type NES_X1_017 = device_creator<nes_x1_017_device>;
nes_tc0190fmc_device::nes_tc0190fmc_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)
diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp
index af37dc223e0..24c8843637f 100644
--- a/src/devices/bus/nes/tengen.cpp
+++ b/src/devices/bus/nes/tengen.cpp
@@ -38,9 +38,9 @@
// constructor
//-------------------------------------------------
-const device_type NES_TENGEN_800008 = &device_creator<nes_tengen008_device>;
-const device_type NES_TENGEN_800032 = &device_creator<nes_tengen032_device>;
-const device_type NES_TENGEN_800037 = &device_creator<nes_tengen037_device>;
+const device_type NES_TENGEN_800008 = device_creator<nes_tengen008_device>;
+const device_type NES_TENGEN_800032 = device_creator<nes_tengen032_device>;
+const device_type NES_TENGEN_800037 = device_creator<nes_tengen037_device>;
nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp
index daa01bca558..c6c4b6b9ad1 100644
--- a/src/devices/bus/nes/txc.cpp
+++ b/src/devices/bus/nes/txc.cpp
@@ -37,11 +37,11 @@
// constructor
//-------------------------------------------------
-const device_type NES_TXC_22211 = &device_creator<nes_txc_22211_device>;
-const device_type NES_TXC_DUMARACING = &device_creator<nes_txc_dumarc_device>;
-const device_type NES_TXC_MJBLOCK = &device_creator<nes_txc_mjblock_device>;
-const device_type NES_TXC_STRIKEW = &device_creator<nes_txc_strikew_device>;
-const device_type NES_TXC_COMMANDOS = &device_creator<nes_txc_commandos_device>;
+const device_type NES_TXC_22211 = device_creator<nes_txc_22211_device>;
+const device_type NES_TXC_DUMARACING = device_creator<nes_txc_dumarc_device>;
+const device_type NES_TXC_MJBLOCK = device_creator<nes_txc_mjblock_device>;
+const device_type NES_TXC_STRIKEW = device_creator<nes_txc_strikew_device>;
+const device_type NES_TXC_COMMANDOS = device_creator<nes_txc_commandos_device>;
nes_txc_22211_device::nes_txc_22211_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)
diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp
index 509797a22ab..14dad5f7144 100644
--- a/src/devices/bus/nes/waixing.cpp
+++ b/src/devices/bus/nes/waixing.cpp
@@ -33,27 +33,27 @@
// constructor
//-------------------------------------------------
-const device_type NES_WAIXING_A = &device_creator<nes_waixing_a_device>;
-const device_type NES_WAIXING_A1 = &device_creator<nes_waixing_a1_device>;
-const device_type NES_WAIXING_B = &device_creator<nes_waixing_b_device>;
-const device_type NES_WAIXING_C = &device_creator<nes_waixing_c_device>;
-const device_type NES_WAIXING_D = &device_creator<nes_waixing_d_device>;
-const device_type NES_WAIXING_E = &device_creator<nes_waixing_e_device>;
-const device_type NES_WAIXING_F = &device_creator<nes_waixing_f_device>;
-const device_type NES_WAIXING_G = &device_creator<nes_waixing_g_device>;
-const device_type NES_WAIXING_H = &device_creator<nes_waixing_h_device>;
-const device_type NES_WAIXING_H1 = &device_creator<nes_waixing_h1_device>;
-const device_type NES_WAIXING_I = &device_creator<nes_waixing_i_device>;
-const device_type NES_WAIXING_J = &device_creator<nes_waixing_j_device>;
-const device_type NES_WAIXING_SH2 = &device_creator<nes_waixing_sh2_device>;
-const device_type NES_WAIXING_SEC = &device_creator<nes_waixing_sec_device>;
-const device_type NES_WAIXING_SGZ = &device_creator<nes_waixing_sgz_device>;
-const device_type NES_WAIXING_SGZLZ = &device_creator<nes_waixing_sgzlz_device>;
-const device_type NES_WAIXING_FFV = &device_creator<nes_waixing_ffv_device>;
-const device_type NES_WAIXING_WXZS = &device_creator<nes_waixing_wxzs_device>;
-const device_type NES_WAIXING_DQ8 = &device_creator<nes_waixing_dq8_device>;
-const device_type NES_WAIXING_WXZS2 = &device_creator<nes_waixing_wxzs2_device>;
-const device_type NES_WAIXING_FS304 = &device_creator<nes_waixing_fs304_device>;
+const device_type NES_WAIXING_A = device_creator<nes_waixing_a_device>;
+const device_type NES_WAIXING_A1 = device_creator<nes_waixing_a1_device>;
+const device_type NES_WAIXING_B = device_creator<nes_waixing_b_device>;
+const device_type NES_WAIXING_C = device_creator<nes_waixing_c_device>;
+const device_type NES_WAIXING_D = device_creator<nes_waixing_d_device>;
+const device_type NES_WAIXING_E = device_creator<nes_waixing_e_device>;
+const device_type NES_WAIXING_F = device_creator<nes_waixing_f_device>;
+const device_type NES_WAIXING_G = device_creator<nes_waixing_g_device>;
+const device_type NES_WAIXING_H = device_creator<nes_waixing_h_device>;
+const device_type NES_WAIXING_H1 = device_creator<nes_waixing_h1_device>;
+const device_type NES_WAIXING_I = device_creator<nes_waixing_i_device>;
+const device_type NES_WAIXING_J = device_creator<nes_waixing_j_device>;
+const device_type NES_WAIXING_SH2 = device_creator<nes_waixing_sh2_device>;
+const device_type NES_WAIXING_SEC = device_creator<nes_waixing_sec_device>;
+const device_type NES_WAIXING_SGZ = device_creator<nes_waixing_sgz_device>;
+const device_type NES_WAIXING_SGZLZ = device_creator<nes_waixing_sgzlz_device>;
+const device_type NES_WAIXING_FFV = device_creator<nes_waixing_ffv_device>;
+const device_type NES_WAIXING_WXZS = device_creator<nes_waixing_wxzs_device>;
+const device_type NES_WAIXING_DQ8 = device_creator<nes_waixing_dq8_device>;
+const device_type NES_WAIXING_WXZS2 = device_creator<nes_waixing_wxzs2_device>;
+const device_type NES_WAIXING_FS304 = device_creator<nes_waixing_fs304_device>;
nes_waixing_a_device::nes_waixing_a_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)
diff --git a/src/devices/bus/nes/zemina.cpp b/src/devices/bus/nes/zemina.cpp
index f17e3eb981e..bc20a8b3efb 100644
--- a/src/devices/bus/nes/zemina.cpp
+++ b/src/devices/bus/nes/zemina.cpp
@@ -21,7 +21,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_ZEMINA = &device_creator<nes_zemina_device>;
+const device_type NES_ZEMINA = device_creator<nes_zemina_device>;
//**************************************************************************
// LIVE DEVICE
@@ -32,7 +32,7 @@ const device_type NES_ZEMINA = &device_creator<nes_zemina_device>;
//-------------------------------------------------
nes_zemina_device::nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : nes_nrom_device(mconfig, NES_ZEMINA, "NES Cart Zemina PCB", tag, owner, clock, "nes_zemina", __FILE__)
+ : nes_nrom_device(mconfig, NES_ZEMINA, "NES Cart Zemina PCB", tag, owner, clock, "nes_zemina", __FILE__)
{
}
@@ -110,4 +110,4 @@ WRITE8_MEMBER(nes_zemina_device::write_h)
break;
}
}
-} \ No newline at end of file
+}
diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp
index d3fafdd15bf..ee2dc33db49 100644
--- a/src/devices/bus/nes_ctrl/4score.cpp
+++ b/src/devices/bus/nes_ctrl/4score.cpp
@@ -37,8 +37,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_4SCORE_P1P3 = &device_creator<nes_4score_p1p3_device>;
-const device_type NES_4SCORE_P2P4 = &device_creator<nes_4score_p2p4_device>;
+const device_type NES_4SCORE_P1P3 = device_creator<nes_4score_p1p3_device>;
+const device_type NES_4SCORE_P2P4 = device_creator<nes_4score_p2p4_device>;
static INPUT_PORTS_START( nes_4score_p1p3 )
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp
index 00baef8ff06..e4b24692fb1 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.cpp
+++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp
@@ -14,8 +14,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_ARKPADDLE = &device_creator<nes_vaus_device>;
-const device_type NES_ARKPADDLE_FC = &device_creator<nes_vausfc_device>;
+const device_type NES_ARKPADDLE = device_creator<nes_vaus_device>;
+const device_type NES_ARKPADDLE_FC = device_creator<nes_vausfc_device>;
static INPUT_PORTS_START( arkanoid_paddle )
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp
index 54a42b119c0..54cf48ce61f 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/nes_ctrl/bcbattle.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_BARCODE_BATTLER = &device_creator<nes_bcbattle_device>;
+const device_type NES_BARCODE_BATTLER = device_creator<nes_bcbattle_device>;
MACHINE_CONFIG_FRAGMENT( nes_battler )
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index d3ff0e32659..ec439f91dbd 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -64,7 +64,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NES_CONTROL_PORT = &device_creator<nes_control_port_device>;
+const device_type NES_CONTROL_PORT = device_creator<nes_control_port_device>;
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp
index c7a465050d6..27582ac1f76 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.cpp
+++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_FCKEYBOARD = &device_creator<nes_fckeybrd_device>;
+const device_type NES_FCKEYBOARD = device_creator<nes_fckeybrd_device>;
static INPUT_PORTS_START( fc_keyboard )
diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp
index 3207102e4d5..bb9b5ad0f9f 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.cpp
+++ b/src/devices/bus/nes_ctrl/ftrainer.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_FTRAINER = &device_creator<nes_ftrainer_device>;
+const device_type NES_FTRAINER = device_creator<nes_ftrainer_device>;
static INPUT_PORTS_START( nes_joypad )
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index 5c2d5517173..32c088e8954 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -27,8 +27,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_HORITWIN = &device_creator<nes_horitwin_device>;
-const device_type NES_HORI4P = &device_creator<nes_hori4p_device>;
+const device_type NES_HORITWIN = device_creator<nes_horitwin_device>;
+const device_type NES_HORI4P = device_creator<nes_hori4p_device>;
static INPUT_PORTS_START( nes_hori4p )
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index d0ac74450d8..a67bd9bb98a 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -34,11 +34,11 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_JOYPAD = &device_creator<nes_joypad_device>;
-const device_type NES_FCPAD_P2 = &device_creator<nes_fcpad2_device>;
-const device_type NES_CCPAD_LEFT = &device_creator<nes_ccpadl_device>;
-const device_type NES_CCPAD_RIGHT = &device_creator<nes_ccpadr_device>;
-const device_type NES_ARCSTICK = &device_creator<nes_arcstick_device>;
+const device_type NES_JOYPAD = device_creator<nes_joypad_device>;
+const device_type NES_FCPAD_P2 = device_creator<nes_fcpad2_device>;
+const device_type NES_CCPAD_LEFT = device_creator<nes_ccpadl_device>;
+const device_type NES_CCPAD_RIGHT = device_creator<nes_ccpadr_device>;
+const device_type NES_ARCSTICK = device_creator<nes_arcstick_device>;
static INPUT_PORTS_START( nes_joypad )
diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp
index 99be926197c..00b39b25b53 100644
--- a/src/devices/bus/nes_ctrl/konamihs.cpp
+++ b/src/devices/bus/nes_ctrl/konamihs.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_KONAMIHS = &device_creator<nes_konamihs_device>;
+const device_type NES_KONAMIHS = device_creator<nes_konamihs_device>;
static INPUT_PORTS_START( nes_konamihs )
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 2f0ee170aa9..c4dd099ede4 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -19,7 +19,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_MIRACLE = &device_creator<nes_miracle_device>;
+const device_type NES_MIRACLE = device_creator<nes_miracle_device>;
MACHINE_CONFIG_FRAGMENT( nes_miracle )
diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp
index e807836fd0f..fded1549ca5 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.cpp
+++ b/src/devices/bus/nes_ctrl/mjpanel.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_MJPANEL = &device_creator<nes_mjpanel_device>;
+const device_type NES_MJPANEL = device_creator<nes_mjpanel_device>;
static INPUT_PORTS_START( nes_mjpanel )
diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp
index 8d2d0450324..9a82d894b6f 100644
--- a/src/devices/bus/nes_ctrl/pachinko.cpp
+++ b/src/devices/bus/nes_ctrl/pachinko.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_PACHINKO = &device_creator<nes_pachinko_device>;
+const device_type NES_PACHINKO = device_creator<nes_pachinko_device>;
static INPUT_PORTS_START( nes_pachinko )
diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp
index b69ba813681..6a0b3c9880c 100644
--- a/src/devices/bus/nes_ctrl/partytap.cpp
+++ b/src/devices/bus/nes_ctrl/partytap.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_PARTYTAP = &device_creator<nes_partytap_device>;
+const device_type NES_PARTYTAP = device_creator<nes_partytap_device>;
static INPUT_PORTS_START( nes_partytap )
diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp
index f6ce5dfb213..4db046c029c 100644
--- a/src/devices/bus/nes_ctrl/powerpad.cpp
+++ b/src/devices/bus/nes_ctrl/powerpad.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_POWERPAD = &device_creator<nes_powerpad_device>;
+const device_type NES_POWERPAD = device_creator<nes_powerpad_device>;
static INPUT_PORTS_START( nes_powerpad )
diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp
index 63c33d1f008..2f4c0969742 100644
--- a/src/devices/bus/nes_ctrl/suborkey.cpp
+++ b/src/devices/bus/nes_ctrl/suborkey.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_SUBORKEYBOARD = &device_creator<nes_suborkey_device>;
+const device_type NES_SUBORKEYBOARD = device_creator<nes_suborkey_device>;
static INPUT_PORTS_START( fc_suborkey )
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 3c5c4a4e7ce..a1c8efe32dc 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NES_ZAPPER = &device_creator<nes_zapper_device>;
+const device_type NES_ZAPPER = device_creator<nes_zapper_device>;
static INPUT_PORTS_START( nes_zapper )
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index eae75ed16e3..906b8d4d144 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEWBRAIN_EIM = &device_creator<newbrain_eim_t>;
+const device_type NEWBRAIN_EIM = device_creator<newbrain_eim_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp
index e83dd50266f..9e8c989e982 100644
--- a/src/devices/bus/newbrain/exp.cpp
+++ b/src/devices/bus/newbrain/exp.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NEWBRAIN_EXPANSION_SLOT = &device_creator<newbrain_expansion_slot_t>;
+const device_type NEWBRAIN_EXPANSION_SLOT = device_creator<newbrain_expansion_slot_t>;
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index aa422f999d5..b63d7ddffa8 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -35,7 +35,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NEWBRAIN_FDC = &device_creator<newbrain_fdc_t>;
+const device_type NEWBRAIN_FDC = device_creator<newbrain_fdc_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp
index bd13bdb838c..2f21a63cf00 100644
--- a/src/devices/bus/nubus/nubus.cpp
+++ b/src/devices/bus/nubus/nubus.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>;
+const device_type NUBUS_SLOT = device_creator<nubus_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -61,7 +61,7 @@ void nubus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS = &device_creator<nubus_device>;
+const device_type NUBUS = device_creator<nubus_device>;
void nubus_device::static_set_cputag(device_t &device, const char *tag)
{
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp
index 0906d9dfeb6..6c17242ed3f 100644
--- a/src/devices/bus/nubus/nubus_48gc.cpp
+++ b/src/devices/bus/nubus/nubus_48gc.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "nubus_48gc.h"
+#include "screen.h"
#define VRAM_SIZE (0x200000) // 2 megs, maxed out
@@ -40,8 +41,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_48GC = &device_creator<nubus_48gc_device>;
-const device_type NUBUS_824GC = &device_creator<nubus_824gc_device>;
+const device_type NUBUS_48GC = device_creator<nubus_48gc_device>;
+const device_type NUBUS_824GC = device_creator<nubus_824gc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index 09a872f6de4..08387b747e4 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -40,8 +40,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_ASNTMC3NB = &device_creator<nubus_asntmc3nb_device>;
-const device_type NUBUS_APPLEENET = &device_creator<nubus_appleenet_device>;
+const device_type NUBUS_ASNTMC3NB = device_creator<nubus_asntmc3nb_device>;
+const device_type NUBUS_APPLEENET = device_creator<nubus_appleenet_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp
index b7a021a0bd9..65f0a49d80c 100644
--- a/src/devices/bus/nubus/nubus_cb264.cpp
+++ b/src/devices/bus/nubus/nubus_cb264.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "nubus_cb264.h"
+#include "screen.h"
#define CB264_SCREEN_NAME "cb264_screen"
#define CB264_ROM_REGION "cb264_rom"
@@ -39,7 +40,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_CB264 = &device_creator<nubus_cb264_device>;
+const device_type NUBUS_CB264 = device_creator<nubus_cb264_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp
index 7902bf69669..12a16404dd0 100644
--- a/src/devices/bus/nubus/nubus_image.cpp
+++ b/src/devices/bus/nubus/nubus_image.cpp
@@ -62,9 +62,7 @@ public:
// device type definition
-extern const device_type MESSIMG_DISK;
-
-const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>;
+const device_type MESSIMG_DISK = device_creator<messimg_disk_image_device>;
messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__),
@@ -141,7 +139,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_IMAGE = &device_creator<nubus_image_device>;
+const device_type NUBUS_IMAGE = device_creator<nubus_image_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp
index e169586d884..823a1d063e2 100644
--- a/src/devices/bus/nubus/nubus_m2hires.cpp
+++ b/src/devices/bus/nubus/nubus_m2hires.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "nubus_m2hires.h"
+#include "screen.h"
#define M2HIRES_SCREEN_NAME "m2hires_screen"
#define M2HIRES_ROM_REGION "m2hires_rom"
@@ -35,7 +36,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_M2HIRES = &device_creator<nubus_m2hires_device>;
+const device_type NUBUS_M2HIRES = device_creator<nubus_m2hires_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp
index 04db8cffb1b..bfaafc7f932 100644
--- a/src/devices/bus/nubus/nubus_m2video.cpp
+++ b/src/devices/bus/nubus/nubus_m2video.cpp
@@ -13,6 +13,8 @@
#include "emu.h"
#include "nubus_m2video.h"
+#include "screen.h"
+
#define M2VIDEO_SCREEN_NAME "m2video_screen"
#define M2VIDEO_ROM_REGION "m2video_rom"
@@ -36,7 +38,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_M2VIDEO = &device_creator<nubus_m2video_device>;
+const device_type NUBUS_M2VIDEO = device_creator<nubus_m2video_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp
index e12275ab710..f3028bdc598 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.cpp
+++ b/src/devices/bus/nubus/nubus_radiustpd.cpp
@@ -12,6 +12,8 @@
#include "emu.h"
#include "nubus_radiustpd.h"
+#include "screen.h"
+
#define RADIUSTPD_SCREEN_NAME "tpd_screen"
#define RADIUSTPD_ROM_REGION "tpd_rom"
@@ -35,7 +37,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_RADIUSTPD = &device_creator<nubus_radiustpd_device>;
+const device_type NUBUS_RADIUSTPD = device_creator<nubus_radiustpd_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp
index db47b70cd83..b8d4310db99 100644
--- a/src/devices/bus/nubus/nubus_spec8.cpp
+++ b/src/devices/bus/nubus/nubus_spec8.cpp
@@ -14,6 +14,8 @@
#include "emu.h"
#include "nubus_spec8.h"
+#include "screen.h"
+
#define SPEC8S3_SCREEN_NAME "spec8s3_screen"
#define SPEC8S3_ROM_REGION "spec8s3_rom"
@@ -37,7 +39,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_SPEC8S3 = &device_creator<nubus_spec8s3_device>;
+const device_type NUBUS_SPEC8S3 = device_creator<nubus_spec8s3_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp
index 2926d1c2faa..de267c7400b 100644
--- a/src/devices/bus/nubus/nubus_specpdq.cpp
+++ b/src/devices/bus/nubus/nubus_specpdq.cpp
@@ -27,6 +27,8 @@
#include "emu.h"
#include "nubus_specpdq.h"
+#include "screen.h"
+
#define SPECPDQ_SCREEN_NAME "specpdq_screen"
#define SPECPDQ_ROM_REGION "specpdq_rom"
@@ -52,7 +54,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_SPECPDQ = &device_creator<nubus_specpdq_device>;
+const device_type NUBUS_SPECPDQ = device_creator<nubus_specpdq_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp
index 1c12cbba4fa..ed901d672c8 100644
--- a/src/devices/bus/nubus/nubus_vikbw.cpp
+++ b/src/devices/bus/nubus/nubus_vikbw.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "nubus_vikbw.h"
+#include "screen.h"
#define VIKBW_SCREEN_NAME "vikbw_screen"
#define VIKBW_ROM_REGION "vikbw_rom"
@@ -35,7 +36,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_VIKBW = &device_creator<nubus_vikbw_device>;
+const device_type NUBUS_VIKBW = device_creator<nubus_vikbw_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp
index e274a2d812c..e231f7c44e0 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.cpp
+++ b/src/devices/bus/nubus/nubus_wsportrait.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "nubus_wsportrait.h"
+#include "screen.h"
#define WSPORTRAIT_SCREEN_NAME "wsport_screen"
#define WSPORTRAIT_ROM_REGION "wsport_rom"
@@ -38,7 +39,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_WSPORTRAIT = &device_creator<nubus_wsportrait_device>;
+const device_type NUBUS_WSPORTRAIT = device_creator<nubus_wsportrait_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp
index 492ad3a87e7..228055037aa 100644
--- a/src/devices/bus/nubus/pds30_30hr.cpp
+++ b/src/devices/bus/nubus/pds30_30hr.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "pds30_30hr.h"
+#include "screen.h"
#define XCEED30HR_SCREEN_NAME "x30hr_screen"
#define XCEED30HR_ROM_REGION "x30hr_rom"
@@ -38,7 +39,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS030_XCEED30HR = &device_creator<nubus_xceed30hr_device>;
+const device_type PDS030_XCEED30HR = device_creator<nubus_xceed30hr_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp
index c6d5809cb64..7c192b7dff6 100644
--- a/src/devices/bus/nubus/pds30_cb264.cpp
+++ b/src/devices/bus/nubus/pds30_cb264.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "pds30_cb264.h"
+#include "screen.h"
#define CB264SE30_SCREEN_NAME "cb264_screen"
#define CB264SE30_ROM_REGION "cb264_rom"
@@ -31,7 +32,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS030_CB264SE30 = &device_creator<nubus_cb264se30_device>;
+const device_type PDS030_CB264SE30 = device_creator<nubus_cb264se30_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp
index 3aa038639ba..aaf61c68d3f 100644
--- a/src/devices/bus/nubus/pds30_mc30.cpp
+++ b/src/devices/bus/nubus/pds30_mc30.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "pds30_mc30.h"
+#include "screen.h"
#define XCEEDMC30_SCREEN_NAME "x30hr_screen"
#define XCEEDMC30_ROM_REGION "x30hr_rom"
@@ -34,7 +35,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS030_XCEEDMC30 = &device_creator<nubus_xceedmc30_device>;
+const device_type PDS030_XCEEDMC30 = device_creator<nubus_xceedmc30_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp
index 7aefbf0308a..fc7ef895227 100644
--- a/src/devices/bus/nubus/pds30_procolor816.cpp
+++ b/src/devices/bus/nubus/pds30_procolor816.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "pds30_procolor816.h"
+#include "screen.h"
#define PROCOLOR816_SCREEN_NAME "cb264_screen"
#define PROCOLOR816_ROM_REGION "cb264_rom"
@@ -37,7 +38,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS030_PROCOLOR816 = &device_creator<nubus_procolor816_device>;
+const device_type PDS030_PROCOLOR816 = device_creator<nubus_procolor816_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp
index e9588a40568..58e04bd8c8a 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.cpp
+++ b/src/devices/bus/nubus/pds30_sigmalview.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "pds30_sigmalview.h"
+#include "screen.h"
#define LVIEW_SCREEN_NAME "lview_screen"
#define LVIEW_ROM_REGION "lview_rom"
@@ -31,7 +32,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PDS030_LVIEW = &device_creator<nubus_lview_device>;
+const device_type PDS030_LVIEW = device_creator<nubus_lview_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index 9ddd62b7f6a..c67856fbcaa 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -19,7 +19,7 @@
// o2_chess_device - constructor
//-------------------------------------------------
-const device_type O2_ROM_CHESS = &device_creator<o2_chess_device>;
+const device_type O2_ROM_CHESS = device_creator<o2_chess_device>;
o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp
index dac96ec563a..7a073e7fb19 100644
--- a/src/devices/bus/odyssey2/rom.cpp
+++ b/src/devices/bus/odyssey2/rom.cpp
@@ -17,9 +17,9 @@
// o2_rom_device - constructor
//-------------------------------------------------
-const device_type O2_ROM_STD = &device_creator<o2_rom_device>;
-const device_type O2_ROM_12K = &device_creator<o2_rom12_device>;
-const device_type O2_ROM_16K = &device_creator<o2_rom16_device>;
+const device_type O2_ROM_STD = device_creator<o2_rom_device>;
+const device_type O2_ROM_12K = device_creator<o2_rom12_device>;
+const device_type O2_ROM_16K = device_creator<o2_rom16_device>;
o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp
index be6f1441876..3b070f95959 100644
--- a/src/devices/bus/odyssey2/slot.cpp
+++ b/src/devices/bus/odyssey2/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type O2_CART_SLOT = &device_creator<o2_cart_slot_device>;
+const device_type O2_CART_SLOT = device_creator<o2_cart_slot_device>;
//**************************************************************************
// Odyssey 2 Cartridges Interface
diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp
index b46d7010226..7303e0a1939 100644
--- a/src/devices/bus/odyssey2/voice.cpp
+++ b/src/devices/bus/odyssey2/voice.cpp
@@ -14,13 +14,14 @@
#include "emu.h"
#include "voice.h"
+#include "speaker.h"
//-------------------------------------------------
// o2_voice_device - constructor
//-------------------------------------------------
-const device_type O2_ROM_VOICE = &device_creator<o2_voice_device>;
+const device_type O2_ROM_VOICE = device_creator<o2_voice_device>;
o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index f254b676ef5..686ead3cc5d 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -4,7 +4,7 @@
#include "jasmin.h"
#include "formats/oric_dsk.h"
-const device_type JASMIN = &device_creator<jasmin_device>;
+const device_type JASMIN = device_creator<jasmin_device>;
ROM_START( jasmin )
ROM_REGION( 0x800, "jasmin", 0 )
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index 8e087db0bce..c6607ba18fc 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -4,7 +4,7 @@
#include "microdisc.h"
#include "formats/oric_dsk.h"
-const device_type MICRODISC = &device_creator<microdisc_device>;
+const device_type MICRODISC = device_creator<microdisc_device>;
ROM_START( microdisc )
ROM_REGION( 0x2000, "microdisc", 0 )
diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp
index 73e780bdf3a..981507572ef 100644
--- a/src/devices/bus/oricext/oricext.cpp
+++ b/src/devices/bus/oricext/oricext.cpp
@@ -5,7 +5,7 @@
#include "jasmin.h"
#include "microdisc.h"
-const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>;
+const device_type ORICEXT_CONNECTOR = device_creator<oricext_connector>;
oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__),
diff --git a/src/devices/bus/pc1512/mouse.cpp b/src/devices/bus/pc1512/mouse.cpp
index 24bd5f3e451..3029110de6e 100644
--- a/src/devices/bus/pc1512/mouse.cpp
+++ b/src/devices/bus/pc1512/mouse.cpp
@@ -15,8 +15,8 @@
// DEVICE DEFINITION
//**************************************************************************
-const device_type PC1512_MOUSE_PORT = &device_creator<pc1512_mouse_port_t>;
-const device_type PC1512_MOUSE = &device_creator<pc1512_mouse_t>;
+const device_type PC1512_MOUSE_PORT = device_creator<pc1512_mouse_port_t>;
+const device_type PC1512_MOUSE = device_creator<pc1512_mouse_t>;
diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp
index 571aed854c9..925968d9a9e 100644
--- a/src/devices/bus/pc_joy/pc_joy.cpp
+++ b/src/devices/bus/pc_joy/pc_joy.cpp
@@ -12,7 +12,7 @@
#include "pc_joy.h"
#include "pc_joy_sw.h"
-const device_type PC_JOY = &device_creator<pc_joy_device>;
+const device_type PC_JOY = device_creator<pc_joy_device>;
pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__),
@@ -78,7 +78,7 @@ ioport_constructor pc_basic_joy_device::device_input_ports() const
return INPUT_PORTS_NAME( pc_joystick );
}
-const device_type PC_BASIC_JOY = &device_creator<pc_basic_joy_device>;
+const device_type PC_BASIC_JOY = device_creator<pc_basic_joy_device>;
pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_BASIC_JOY, "PC basic joystick", tag, owner, clock, "basic_joy", __FILE__),
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp
index f2dd8448a18..817798ff383 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.cpp
+++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp
@@ -5,7 +5,7 @@
#include "emu.h"
#include "pc_joy_sw.h"
-const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>;
+const device_type PC_MSSW_PAD = device_creator<pc_mssw_pad_device>;
pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, PC_MSSW_PAD, "Microsoft Sidewinder Pad", tag, owner, clock, "mssw_pad", __FILE__),
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 007c8a15e85..3b86b1a56cf 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -39,7 +39,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC_KBD_EC_1841 = &device_creator<ec_1841_keyboard_device>;
+const device_type PC_KBD_EC_1841 = device_creator<ec_1841_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index 06a84b964eb..47701c0010a 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -34,7 +34,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC_KBD_ISKR_1030 = &device_creator<iskr_1030_keyboard_device>;
+const device_type PC_KBD_ISKR_1030 = device_creator<iskr_1030_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 480e0a65b75..cd2b1ce79bd 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -336,8 +336,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PC_KBD_KEYTRONIC_PC3270 = &device_creator<pc_kbd_keytronic_pc3270_device>;
-const device_type PC_KBD_KEYTRONIC_PC3270_AT = &device_creator<pc_kbd_keytronic_pc3270_at_device>;
+const device_type PC_KBD_KEYTRONIC_PC3270 = device_creator<pc_kbd_keytronic_pc3270_device>;
+const device_type PC_KBD_KEYTRONIC_PC3270_AT = device_creator<pc_kbd_keytronic_pc3270_at_device>;
/*****************************************************************************
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index e7aaf50e968..734ae193b9e 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -194,7 +194,7 @@ INPUT_PORTS_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PC_KBD_MICROSOFT_NATURAL = &device_creator<pc_kbd_microsoft_natural_device>;
+const device_type PC_KBD_MICROSOFT_NATURAL = device_creator<pc_kbd_microsoft_natural_device>;
/*****************************************************************************
ADDRESS MAPS
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index f2f795763cb..7ff7ad4f4e0 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC_KBD_IBM_PC_83 = &device_creator<ibm_pc_83_keyboard_device>;
+const device_type PC_KBD_IBM_PC_83 = device_creator<ibm_pc_83_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp
index d5768d633f4..fd87cca47fc 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.cpp
+++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp
@@ -21,7 +21,7 @@ The following basic program can be useful for identifying scancodes:
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>;
+const device_type PC_KBDC_SLOT = device_creator<pc_kbdc_slot_device>;
//**************************************************************************
// LIVE DEVICE
@@ -63,7 +63,7 @@ void pc_kbdc_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PC_KBDC = &device_creator<pc_kbdc_device>;
+const device_type PC_KBDC = device_creator<pc_kbdc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index d99e787f781..a0ea6f2c1f6 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -41,8 +41,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC_KBD_IBM_PC_AT_84 = &device_creator<ibm_pc_at_84_keyboard_device>;
-const device_type PC_KBD_IBM_3270PC_122 = &device_creator<ibm_3270pc_122_keyboard_device>;
+const device_type PC_KBD_IBM_PC_AT_84 = device_creator<ibm_pc_at_84_keyboard_device>;
+const device_type PC_KBD_IBM_3270PC_122 = device_creator<ibm_3270pc_122_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index 56f432fbabc..00ba9400b29 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -33,7 +33,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC_KBD_IBM_PC_XT_83 = &device_creator<ibm_pc_xt_83_keyboard_device>;
+const device_type PC_KBD_IBM_PC_XT_83 = device_creator<ibm_pc_xt_83_keyboard_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp
index 553ac06fedf..1608b1cbb0e 100644
--- a/src/devices/bus/pce/pce_rom.cpp
+++ b/src/devices/bus/pce/pce_rom.cpp
@@ -17,10 +17,10 @@
// pce_rom_device - constructor
//-------------------------------------------------
-const device_type PCE_ROM_STD = &device_creator<pce_rom_device>;
-const device_type PCE_ROM_CDSYS3 = &device_creator<pce_cdsys3_device>;
-const device_type PCE_ROM_POPULOUS = &device_creator<pce_populous_device>;
-const device_type PCE_ROM_SF2 = &device_creator<pce_sf2_device>;
+const device_type PCE_ROM_STD = device_creator<pce_rom_device>;
+const device_type PCE_ROM_CDSYS3 = device_creator<pce_cdsys3_device>;
+const device_type PCE_ROM_POPULOUS = device_creator<pce_populous_device>;
+const device_type PCE_ROM_SF2 = device_creator<pce_sf2_device>;
pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp
index eb6fd88965a..26b4bdd6bf9 100644
--- a/src/devices/bus/pce/pce_slot.cpp
+++ b/src/devices/bus/pce/pce_slot.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PCE_CART_SLOT = &device_creator<pce_cart_slot_device>;
+const device_type PCE_CART_SLOT = device_creator<pce_cart_slot_device>;
//**************************************************************************
// PCE cartridges Interface
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index f7ce25d7b3d..8c1bc4bfbda 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -48,14 +48,16 @@ Connections
#include "emu.h"
#include "2joysnd.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE = &device_creator<pet_userport_joystick_and_sound_device>;
+const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE = device_creator<pet_userport_joystick_and_sound_device>;
MACHINE_CONFIG_FRAGMENT( 2joysnd )
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index ac51df8c377..1c1a79b1bf2 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_64K = &device_creator<pet_64k_expansion_device>;
+const device_type PET_64K = device_creator<pet_64k_expansion_device>;
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index c13223f965a..6276aab8fd4 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -15,9 +15,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C2N = &device_creator<c2n_device>;
-const device_type C1530 = &device_creator<c1530_device>;
-const device_type C1531 = &device_creator<c1531_device>;
+const device_type C2N = device_creator<c2n_device>;
+const device_type C1530 = device_creator<c1530_device>;
+const device_type C1531 = device_creator<c1531_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp
index e06682f2c3e..fc9f5ded21c 100644
--- a/src/devices/bus/pet/cass.cpp
+++ b/src/devices/bus/pet/cass.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PET_DATASSETTE_PORT = &device_creator<pet_datassette_port_device>;
+const device_type PET_DATASSETTE_PORT = device_creator<pet_datassette_port_device>;
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index 63b227adec7..5dc3bd1823f 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -10,13 +10,16 @@
#include "emu.h"
#include "cb2snd.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_USERPORT_CB2_SOUND_DEVICE = &device_creator<pet_userport_cb2_sound_device>;
+const device_type PET_USERPORT_CB2_SOUND_DEVICE = device_creator<pet_userport_cb2_sound_device>;
MACHINE_CONFIG_FRAGMENT( cb2snd )
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp
index eef41f4f526..27a318f2e3e 100644
--- a/src/devices/bus/pet/diag.cpp
+++ b/src/devices/bus/pet/diag.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = &device_creator<pet_userport_diagnostic_connector_t>;
+const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = device_creator<pet_userport_diagnostic_connector_t>;
diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp
index 60183f51925..214fee34be3 100644
--- a/src/devices/bus/pet/diag264_lb_tape.cpp
+++ b/src/devices/bus/pet/diag264_lb_tape.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator<diag264_cassette_loopback_device>;
+const device_type DIAG264_CASSETTE_LOOPBACK = device_creator<diag264_cassette_loopback_device>;
diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index c716791e558..0097953e57a 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device>;
+const device_type PET_EXPANSION_SLOT = device_creator<pet_expansion_slot_device>;
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index eb3ab8caf3f..cc1e8606b11 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -20,6 +20,8 @@
#include "emu.h"
#include "hsg.h"
+#include "screen.h"
+
//**************************************************************************
@@ -36,8 +38,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CBM8000_HSG_A = &device_creator<cbm8000_hsg_a_t>;
-const device_type CBM8000_HSG_B = &device_creator<cbm8000_hsg_b_t>;
+const device_type CBM8000_HSG_A = device_creator<cbm8000_hsg_a_t>;
+const device_type CBM8000_HSG_B = device_creator<cbm8000_hsg_b_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp
index 9bedbb7b051..a4e11d2aa3d 100644
--- a/src/devices/bus/pet/petuja.cpp
+++ b/src/devices/bus/pet/petuja.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PET_USERPORT_JOYSTICK_ADAPTER = &device_creator<pet_userport_joystick_adapter_device>;
+const device_type PET_USERPORT_JOYSTICK_ADAPTER = device_creator<pet_userport_joystick_adapter_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index 3016b91739c..77a9f65cad0 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -28,7 +28,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SUPERPET = &device_creator<superpet_device>;
+const device_type SUPERPET = device_creator<superpet_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp
index f3e0f37b635..0fdda61ca9a 100644
--- a/src/devices/bus/pet/user.cpp
+++ b/src/devices/bus/pet/user.cpp
@@ -11,7 +11,7 @@
// class pet_user_port_device
-const device_type PET_USER_PORT = &device_creator<pet_user_port_device>;
+const device_type PET_USER_PORT = device_creator<pet_user_port_device>;
pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__),
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index e0d19426a47..208337fec4a 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -27,7 +27,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C1551 = &device_creator<c1551_t>;
+const device_type C1551 = device_creator<c1551_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp
index 2dd645f6759..d3978801a88 100644
--- a/src/devices/bus/plus4/diag264_lb_user.cpp
+++ b/src/devices/bus/plus4/diag264_lb_user.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator<diag264_user_port_loopback_device>;
+const device_type DIAG264_USER_PORT_LOOPBACK = device_creator<diag264_user_port_loopback_device>;
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp
index 2bdd35361fc..188ccb8eaf4 100644
--- a/src/devices/bus/plus4/exp.cpp
+++ b/src/devices/bus/plus4/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PLUS4_EXPANSION_SLOT = &device_creator<plus4_expansion_slot_device>;
+const device_type PLUS4_EXPANSION_SLOT = device_creator<plus4_expansion_slot_device>;
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index 4616588327c..00a2ec25cbe 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -20,6 +20,8 @@
#include "emu.h"
#include "sid.h"
+#include "speaker.h"
+
//**************************************************************************
@@ -35,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PLUS4_SID = &device_creator<plus4_sid_cartridge_device>;
+const device_type PLUS4_SID = device_creator<plus4_sid_cartridge_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp
index aa5c9efa4a0..781bb9f0d92 100644
--- a/src/devices/bus/plus4/std.cpp
+++ b/src/devices/bus/plus4/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PLUS4_STD = &device_creator<plus4_standard_cartridge_device>;
+const device_type PLUS4_STD = device_creator<plus4_standard_cartridge_device>;
diff --git a/src/devices/bus/pofo/ccm.cpp b/src/devices/bus/pofo/ccm.cpp
index edab9fa1f63..d5dc761db2b 100644
--- a/src/devices/bus/pofo/ccm.cpp
+++ b/src/devices/bus/pofo/ccm.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PORTFOLIO_MEMORY_CARD_SLOT = &device_creator<portfolio_memory_card_slot_t>;
+const device_type PORTFOLIO_MEMORY_CARD_SLOT = device_creator<portfolio_memory_card_slot_t>;
diff --git a/src/devices/bus/pofo/exp.cpp b/src/devices/bus/pofo/exp.cpp
index d9049daedbd..c8f5733fe2c 100644
--- a/src/devices/bus/pofo/exp.cpp
+++ b/src/devices/bus/pofo/exp.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PORTFOLIO_EXPANSION_SLOT = &device_creator<portfolio_expansion_slot_t>;
+const device_type PORTFOLIO_EXPANSION_SLOT = device_creator<portfolio_expansion_slot_t>;
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index 40a36e95afe..8d106f00a37 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HPC101 = &device_creator<hpc101_t>;
+const device_type HPC101 = device_creator<hpc101_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index 3324bc4b9f0..72c886b32d3 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HPC102 = &device_creator<hpc102_t>;
+const device_type HPC102 = device_creator<hpc102_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 579f2ca90ac..050fdc2bb6c 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -23,8 +23,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HPC104 = &device_creator<hpc104_t>;
-const device_type HPC104_2 = &device_creator<hpc104_2_t>;
+const device_type HPC104 = device_creator<hpc104_t>;
+const device_type HPC104_2 = device_creator<hpc104_2_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/pofo/ram.cpp b/src/devices/bus/pofo/ram.cpp
index a8dedd23ffa..79d2a87ad0e 100644
--- a/src/devices/bus/pofo/ram.cpp
+++ b/src/devices/bus/pofo/ram.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PORTFOLIO_RAM_CARD = &device_creator<portfolio_ram_card_t>;
+const device_type PORTFOLIO_RAM_CARD = device_creator<portfolio_ram_card_t>;
//**************************************************************************
diff --git a/src/devices/bus/pofo/rom.cpp b/src/devices/bus/pofo/rom.cpp
index 43073479f09..b3862b15753 100644
--- a/src/devices/bus/pofo/rom.cpp
+++ b/src/devices/bus/pofo/rom.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PORTFOLIO_ROM_CARD = &device_creator<portfolio_rom_card_t>;
+const device_type PORTFOLIO_ROM_CARD = device_creator<portfolio_rom_card_t>;
//**************************************************************************
diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp
index 012ebd87020..cea69c2f930 100644
--- a/src/devices/bus/psx/analogue.cpp
+++ b/src/devices/bus/psx/analogue.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "analogue.h"
-const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>;
-const device_type PSX_DUALSHOCK = &device_creator<psx_dualshock_device>;
+const device_type PSX_ANALOG_JOYSTICK = device_creator<psx_analog_joystick_device>;
+const device_type PSX_DUALSHOCK = device_creator<psx_dualshock_device>;
psx_analog_controller_device::psx_analog_controller_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/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index 9be4e6b4431..5ca35dc27ec 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -7,7 +7,7 @@
#include "analogue.h"
#include "multitap.h"
-const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_device>;
+const device_type PSX_CONTROLLER_PORT = device_creator<psx_controller_port_device>;
psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__),
@@ -40,7 +40,7 @@ void psx_controller_port_device::disable_card(bool state)
m_card->disable(state);
}
-const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>;
+const device_type PSXCONTROLLERPORTS = device_creator<psxcontrollerports_device>;
psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr),
@@ -172,7 +172,7 @@ void device_psx_controller_interface::sel_w(bool state) {
m_sel = state;
}
-const device_type PSX_STANDARD_CONTROLLER = &device_creator<psx_standard_controller_device>;
+const device_type PSX_STANDARD_CONTROLLER = device_creator<psx_standard_controller_device>;
psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__),
diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp
index 50d36d19a9b..567cd615e65 100644
--- a/src/devices/bus/psx/memcard.cpp
+++ b/src/devices/bus/psx/memcard.cpp
@@ -24,7 +24,7 @@
static const int block_size = 128;
static const int card_size = block_size * 1024;
-const device_type PSXCARD = &device_creator<psxcard_device>;
+const device_type PSXCARD = device_creator<psxcard_device>;
enum transfer_states
{
diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp
index c1c501043bd..2c70a6dc9e0 100644
--- a/src/devices/bus/psx/multitap.cpp
+++ b/src/devices/bus/psx/multitap.cpp
@@ -5,7 +5,7 @@
#include "emu.h"
#include "multitap.h"
-const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>;
+const device_type PSX_MULTITAP = device_creator<psx_multitap_device>;
psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__),
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index 06112121975..30f3b15c8ac 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CST_Q_PLUS4 = &device_creator<cst_q_plus4_t>;
+const device_type CST_Q_PLUS4 = device_creator<cst_q_plus4_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp
index 83297a3ff39..db18cd6241b 100644
--- a/src/devices/bus/ql/cst_qdisc.cpp
+++ b/src/devices/bus/ql/cst_qdisc.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CST_QL_DISC_INTERFACE = &device_creator<cst_ql_disc_interface_t>;
+const device_type CST_QL_DISC_INTERFACE = device_creator<cst_ql_disc_interface_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp
index 400b969adec..f43844223da 100644
--- a/src/devices/bus/ql/cumana_fdi.cpp
+++ b/src/devices/bus/ql/cumana_fdi.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CUMANA_FLOPPY_DISK_INTERFACE = &device_creator<cumana_floppy_disk_interface_t>;
+const device_type CUMANA_FLOPPY_DISK_INTERFACE = device_creator<cumana_floppy_disk_interface_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp
index d5d48e91099..2794b252b44 100644
--- a/src/devices/bus/ql/exp.cpp
+++ b/src/devices/bus/ql/exp.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QL_EXPANSION_SLOT = &device_creator<ql_expansion_slot_t>;
+const device_type QL_EXPANSION_SLOT = device_creator<ql_expansion_slot_t>;
diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp
index 676121d7461..4430c07b3a2 100644
--- a/src/devices/bus/ql/kempston_di.cpp
+++ b/src/devices/bus/ql/kempston_di.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type KEMPSTON_DISK_INTERFACE = &device_creator<kempston_disk_interface_t>;
+const device_type KEMPSTON_DISK_INTERFACE = device_creator<kempston_disk_interface_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp
index 2f2c4fd4542..167955ac4cf 100644
--- a/src/devices/bus/ql/miracle_gold_card.cpp
+++ b/src/devices/bus/ql/miracle_gold_card.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MIRACLE_GOLD_CARD = &device_creator<miracle_gold_card_t>;
+const device_type MIRACLE_GOLD_CARD = device_creator<miracle_gold_card_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp
index 895aa7f768e..040c3c691cc 100644
--- a/src/devices/bus/ql/miracle_hd.cpp
+++ b/src/devices/bus/ql/miracle_hd.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MIRACLE_HARD_DISK = &device_creator<miracle_hard_disk_t>;
+const device_type MIRACLE_HARD_DISK = device_creator<miracle_hard_disk_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp
index 8b422c912e1..2aac9dd094c 100644
--- a/src/devices/bus/ql/mp_fdi.cpp
+++ b/src/devices/bus/ql/mp_fdi.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE = &device_creator<micro_peripherals_floppy_disk_interface_t>;
+const device_type MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE = device_creator<micro_peripherals_floppy_disk_interface_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp
index ebe8f820dc8..8cefd393ade 100644
--- a/src/devices/bus/ql/opd_basic_master.cpp
+++ b/src/devices/bus/ql/opd_basic_master.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type OPD_BASIC_MASTER = &device_creator<opd_basic_master_t>;
+const device_type OPD_BASIC_MASTER = device_creator<opd_basic_master_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp
index 85c6f776f58..1307f024047 100644
--- a/src/devices/bus/ql/pcml_qdisk.cpp
+++ b/src/devices/bus/ql/pcml_qdisk.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PCML_Q_DISK_INTERFACE = &device_creator<pcml_q_disk_interface_t>;
+const device_type PCML_Q_DISK_INTERFACE = device_creator<pcml_q_disk_interface_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index c69e8953ff7..30591d96aab 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -55,7 +55,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QUBIDE = &device_creator<qubide_t>;
+const device_type QUBIDE = device_creator<qubide_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp
index c4f0ff2eb78..faee2e67085 100644
--- a/src/devices/bus/ql/rom.cpp
+++ b/src/devices/bus/ql/rom.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QL_ROM_CARTRIDGE_SLOT = &device_creator<ql_rom_cartridge_slot_t>;
+const device_type QL_ROM_CARTRIDGE_SLOT = device_creator<ql_rom_cartridge_slot_t>;
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index 2e820e5b472..f04c1edaa8d 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SANDY_SUPER_DISK = &device_creator<sandy_super_disk_t>;
+const device_type SANDY_SUPER_DISK = device_creator<sandy_super_disk_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index a79774cd7bb..c3eeb342e18 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -25,10 +25,10 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SANDY_SUPERQBOARD = &device_creator<sandy_superqboard_t>;
-const device_type SANDY_SUPERQBOARD_512K = &device_creator<sandy_superqboard_512k_t>;
-const device_type SANDY_SUPERQMOUSE = &device_creator<sandy_superqmouse_t>;
-const device_type SANDY_SUPERQMOUSE_512K = &device_creator<sandy_superqmouse_512k_t>;
+const device_type SANDY_SUPERQBOARD = device_creator<sandy_superqboard_t>;
+const device_type SANDY_SUPERQBOARD_512K = device_creator<sandy_superqboard_512k_t>;
+const device_type SANDY_SUPERQMOUSE = device_creator<sandy_superqmouse_t>;
+const device_type SANDY_SUPERQMOUSE_512K = device_creator<sandy_superqmouse_512k_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp
index d267059f3ac..8fc5424cf63 100644
--- a/src/devices/bus/ql/std.cpp
+++ b/src/devices/bus/ql/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QL_STANDARD_ROM_CARTRIDGE = &device_creator<ql_standard_rom_cartridge_t>;
+const device_type QL_STANDARD_ROM_CARTRIDGE = device_creator<ql_standard_rom_cartridge_t>;
diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp
index 6af55227569..be3ae9baa76 100644
--- a/src/devices/bus/ql/trumpcard.cpp
+++ b/src/devices/bus/ql/trumpcard.cpp
@@ -23,10 +23,10 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QL_TRUMP_CARD = &device_creator<ql_trump_card_t>;
-const device_type QL_TRUMP_CARD_256K = &device_creator<ql_trump_card_256k_t>;
-const device_type QL_TRUMP_CARD_512K = &device_creator<ql_trump_card_512k_t>;
-const device_type QL_TRUMP_CARD_768K = &device_creator<ql_trump_card_768k_t>;
+const device_type QL_TRUMP_CARD = device_creator<ql_trump_card_t>;
+const device_type QL_TRUMP_CARD_256K = device_creator<ql_trump_card_256k_t>;
+const device_type QL_TRUMP_CARD_512K = device_creator<ql_trump_card_512k_t>;
+const device_type QL_TRUMP_CARD_768K = device_creator<ql_trump_card_768k_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp
index 1f78880a9b2..4d234ef1576 100644
--- a/src/devices/bus/rs232/keyboard.cpp
+++ b/src/devices/bus/rs232/keyboard.cpp
@@ -100,4 +100,4 @@ void serial_keyboard_device::received_byte(uint8_t byte)
{
}
-const device_type SERIAL_KEYBOARD = &device_creator<serial_keyboard_device>;
+const device_type SERIAL_KEYBOARD = device_creator<serial_keyboard_device>;
diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp
index 01ef229be4b..cba8acf944c 100644
--- a/src/devices/bus/rs232/loopback.cpp
+++ b/src/devices/bus/rs232/loopback.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "loopback.h"
-const device_type RS232_LOOPBACK = &device_creator<rs232_loopback_device>;
+const device_type RS232_LOOPBACK = device_creator<rs232_loopback_device>;
rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, RS232_LOOPBACK, "RS232 Loopback", tag, owner, clock, "rs232_loopback", __FILE__),
diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp
index 30b5732a72d..9baa1ef7435 100644
--- a/src/devices/bus/rs232/null_modem.cpp
+++ b/src/devices/bus/rs232/null_modem.cpp
@@ -138,4 +138,4 @@ void null_modem_device::rcv_complete()
m_stream->output(get_received_char());
}
-const device_type NULL_MODEM = &device_creator<null_modem_device>;
+const device_type NULL_MODEM = device_creator<null_modem_device>;
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index 440cab877ec..ef4f8ef9c38 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -83,4 +83,4 @@ void serial_printer_device::rcv_complete()
m_printer->output(get_received_char());
}
-const device_type SERIAL_PRINTER = &device_creator<serial_printer_device>;
+const device_type SERIAL_PRINTER = device_creator<serial_printer_device>;
diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp
index a7f343bec56..38d7c5f88e7 100644
--- a/src/devices/bus/rs232/pty.cpp
+++ b/src/devices/bus/rs232/pty.cpp
@@ -137,4 +137,4 @@ void pseudo_terminal_device::queue(void)
}
}
-const device_type PSEUDO_TERMINAL = &device_creator<pseudo_terminal_device>;
+const device_type PSEUDO_TERMINAL = device_creator<pseudo_terminal_device>;
diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp
index 44dfb5481bf..9ce787f0ab3 100644
--- a/src/devices/bus/rs232/rs232.cpp
+++ b/src/devices/bus/rs232/rs232.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "rs232.h"
-const device_type RS232_PORT = &device_creator<rs232_port_device>;
+const device_type RS232_PORT = device_creator<rs232_port_device>;
rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__),
diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp
index c7c316231a3..508e4072741 100644
--- a/src/devices/bus/rs232/ser_mouse.cpp
+++ b/src/devices/bus/rs232/ser_mouse.cpp
@@ -29,14 +29,14 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t
{
}
-const device_type MSFT_SERIAL_MOUSE = &device_creator<microsoft_mouse_device>;
+const device_type MSFT_SERIAL_MOUSE = device_creator<microsoft_mouse_device>;
microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__)
{
}
-const device_type MSYSTEM_SERIAL_MOUSE = &device_creator<mouse_systems_mouse_device>;
+const device_type MSYSTEM_SERIAL_MOUSE = device_creator<mouse_systems_mouse_device>;
mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__)
diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp
index cb1ac3290e4..a5e851c8d15 100644
--- a/src/devices/bus/rs232/sun_kbd.cpp
+++ b/src/devices/bus/rs232/sun_kbd.cpp
@@ -2,7 +2,7 @@
#include "sun_kbd.h"
-device_type const SUN_KBD_ADAPTOR = &device_creator<sun_keyboard_adaptor_device>;
+device_type const SUN_KBD_ADAPTOR = device_creator<sun_keyboard_adaptor_device>;
namespace {
diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp
index 47fae4f6d66..5835500b5fb 100644
--- a/src/devices/bus/rs232/terminal.cpp
+++ b/src/devices/bus/rs232/terminal.cpp
@@ -93,4 +93,4 @@ void serial_terminal_device::received_byte(uint8_t byte)
term_write(byte);
}
-const device_type SERIAL_TERMINAL = &device_creator<serial_terminal_device>;
+const device_type SERIAL_TERMINAL = device_creator<serial_terminal_device>;
diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp
index a2693808213..6b94b0e2cb6 100644
--- a/src/devices/bus/rs232/xvd701.cpp
+++ b/src/devices/bus/rs232/xvd701.cpp
@@ -150,4 +150,4 @@ void jvc_xvd701_device::rcv_complete()
}
}
-const device_type JVC_XVD701 = &device_creator<jvc_xvd701_device>;
+const device_type JVC_XVD701 = device_creator<jvc_xvd701_device>;
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index 1522f2d2243..f83d7e3a420 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -33,7 +33,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_DJ2DB = &device_creator<s100_dj2db_device>;
+const device_type S100_DJ2DB = device_creator<s100_dj2db_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index feaa034d161..ef6b93353a3 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_DJDMA = &device_creator<s100_djdma_device>;
+const device_type S100_DJDMA = device_creator<s100_djdma_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp
index 3a649c7bb5d..4026d17385e 100644
--- a/src/devices/bus/s100/mm65k16s.cpp
+++ b/src/devices/bus/s100/mm65k16s.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_MM65K16S = &device_creator<s100_mm65k16s_device>;
+const device_type S100_MM65K16S = device_creator<s100_mm65k16s_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp
index 2fb14315333..956dc3b081e 100644
--- a/src/devices/bus/s100/nsmdsa.cpp
+++ b/src/devices/bus/s100/nsmdsa.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_MDS_A = &device_creator<s100_mds_a_device>;
+const device_type S100_MDS_A = device_creator<s100_mds_a_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp
index 67a56ce37da..4cb2da40d0f 100644
--- a/src/devices/bus/s100/nsmdsad.cpp
+++ b/src/devices/bus/s100/nsmdsad.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_MDS_AD = &device_creator<s100_mds_ad_device>;
+const device_type S100_MDS_AD = device_creator<s100_mds_ad_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp
index 01a0cfbaffe..628daf29222 100644
--- a/src/devices/bus/s100/s100.cpp
+++ b/src/devices/bus/s100/s100.cpp
@@ -14,8 +14,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_BUS = &device_creator<s100_bus_t>;
-const device_type S100_SLOT = &device_creator<s100_slot_t>;
+const device_type S100_BUS = device_creator<s100_bus_t>;
+const device_type S100_SLOT = device_creator<s100_slot_t>;
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index d60dd01d727..09ee10d71e1 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S100_WUNDERBUS = &device_creator<s100_wunderbus_device>;
+const device_type S100_WUNDERBUS = device_creator<s100_wunderbus_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/sat_ctrl/analog.cpp b/src/devices/bus/sat_ctrl/analog.cpp
index 8f40c2133d3..1ac30a9bd3a 100644
--- a/src/devices/bus/sat_ctrl/analog.cpp
+++ b/src/devices/bus/sat_ctrl/analog.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_ANALOG = &device_creator<saturn_analog_device>;
+const device_type SATURN_ANALOG = device_creator<saturn_analog_device>;
static INPUT_PORTS_START( saturn_analog )
diff --git a/src/devices/bus/sat_ctrl/ctrl.cpp b/src/devices/bus/sat_ctrl/ctrl.cpp
index 69268030ec9..24239d0c67f 100644
--- a/src/devices/bus/sat_ctrl/ctrl.cpp
+++ b/src/devices/bus/sat_ctrl/ctrl.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SATURN_CONTROL_PORT = &device_creator<saturn_control_port_device>;
+const device_type SATURN_CONTROL_PORT = device_creator<saturn_control_port_device>;
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/joy.cpp b/src/devices/bus/sat_ctrl/joy.cpp
index 5e405842b29..cabc0438304 100644
--- a/src/devices/bus/sat_ctrl/joy.cpp
+++ b/src/devices/bus/sat_ctrl/joy.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_JOY = &device_creator<saturn_joy_device>;
+const device_type SATURN_JOY = device_creator<saturn_joy_device>;
static INPUT_PORTS_START( saturn_joy )
diff --git a/src/devices/bus/sat_ctrl/joy_md.cpp b/src/devices/bus/sat_ctrl/joy_md.cpp
index eafcb4e5d41..bb6f076b127 100644
--- a/src/devices/bus/sat_ctrl/joy_md.cpp
+++ b/src/devices/bus/sat_ctrl/joy_md.cpp
@@ -13,8 +13,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_JOYMD3B = &device_creator<saturn_joymd3b_device>;
-const device_type SATURN_JOYMD6B = &device_creator<saturn_joymd6b_device>;
+const device_type SATURN_JOYMD3B = device_creator<saturn_joymd3b_device>;
+const device_type SATURN_JOYMD6B = device_creator<saturn_joymd6b_device>;
static INPUT_PORTS_START( saturn_md3b )
PORT_START("JOY")
diff --git a/src/devices/bus/sat_ctrl/keybd.cpp b/src/devices/bus/sat_ctrl/keybd.cpp
index ddab85a5c91..6d11b798c9f 100644
--- a/src/devices/bus/sat_ctrl/keybd.cpp
+++ b/src/devices/bus/sat_ctrl/keybd.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_KEYBD = &device_creator<saturn_keybd_device>;
+const device_type SATURN_KEYBD = device_creator<saturn_keybd_device>;
static INPUT_PORTS_START( saturn_joy )
diff --git a/src/devices/bus/sat_ctrl/mouse.cpp b/src/devices/bus/sat_ctrl/mouse.cpp
index 2ae29cabb20..957a3ce2d81 100644
--- a/src/devices/bus/sat_ctrl/mouse.cpp
+++ b/src/devices/bus/sat_ctrl/mouse.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_MOUSE = &device_creator<saturn_mouse_device>;
+const device_type SATURN_MOUSE = device_creator<saturn_mouse_device>;
static INPUT_PORTS_START( saturn_mouse )
diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp
index 85798aedfc1..8ab7f675e61 100644
--- a/src/devices/bus/sat_ctrl/multitap.cpp
+++ b/src/devices/bus/sat_ctrl/multitap.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_MULTITAP = &device_creator<saturn_multitap_device>;
+const device_type SATURN_MULTITAP = device_creator<saturn_multitap_device>;
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/pointer.cpp b/src/devices/bus/sat_ctrl/pointer.cpp
index 77116d44b4d..11c73615b45 100644
--- a/src/devices/bus/sat_ctrl/pointer.cpp
+++ b/src/devices/bus/sat_ctrl/pointer.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_TRACK = &device_creator<saturn_track_device>;
+const device_type SATURN_TRACK = device_creator<saturn_track_device>;
static INPUT_PORTS_START( saturn_track )
diff --git a/src/devices/bus/sat_ctrl/racing.cpp b/src/devices/bus/sat_ctrl/racing.cpp
index c01cf31cf02..fac3d6506f2 100644
--- a/src/devices/bus/sat_ctrl/racing.cpp
+++ b/src/devices/bus/sat_ctrl/racing.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_WHEEL = &device_creator<saturn_wheel_device>;
+const device_type SATURN_WHEEL = device_creator<saturn_wheel_device>;
static INPUT_PORTS_START( saturn_racing )
diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp
index 42a4a32bd1d..480b9b91da5 100644
--- a/src/devices/bus/sat_ctrl/segatap.cpp
+++ b/src/devices/bus/sat_ctrl/segatap.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SATURN_SEGATAP = &device_creator<saturn_segatap_device>;
+const device_type SATURN_SEGATAP = device_creator<saturn_segatap_device>;
//**************************************************************************
diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp
index 497580a9973..9178f1210ee 100644
--- a/src/devices/bus/saturn/bram.cpp
+++ b/src/devices/bus/saturn/bram.cpp
@@ -15,10 +15,10 @@
// constructor
//-------------------------------------------------
-const device_type SATURN_BRAM_4MB = &device_creator<saturn_bram4mb_device>;
-const device_type SATURN_BRAM_8MB = &device_creator<saturn_bram8mb_device>;
-const device_type SATURN_BRAM_16MB = &device_creator<saturn_bram16mb_device>;
-const device_type SATURN_BRAM_32MB = &device_creator<saturn_bram32mb_device>;
+const device_type SATURN_BRAM_4MB = device_creator<saturn_bram4mb_device>;
+const device_type SATURN_BRAM_8MB = device_creator<saturn_bram8mb_device>;
+const device_type SATURN_BRAM_16MB = device_creator<saturn_bram16mb_device>;
+const device_type SATURN_BRAM_32MB = device_creator<saturn_bram32mb_device>;
saturn_bram_device::saturn_bram_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)
diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp
index c7b96edff91..6255f97b6d6 100644
--- a/src/devices/bus/saturn/dram.cpp
+++ b/src/devices/bus/saturn/dram.cpp
@@ -15,8 +15,8 @@
// constructor
//-------------------------------------------------
-const device_type SATURN_DRAM_8MB = &device_creator<saturn_dram8mb_device>;
-const device_type SATURN_DRAM_32MB = &device_creator<saturn_dram32mb_device>;
+const device_type SATURN_DRAM_8MB = device_creator<saturn_dram8mb_device>;
+const device_type SATURN_DRAM_32MB = device_creator<saturn_dram32mb_device>;
saturn_dram_device::saturn_dram_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)
diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp
index 3fbb441b6c6..152eeb18f87 100644
--- a/src/devices/bus/saturn/rom.cpp
+++ b/src/devices/bus/saturn/rom.cpp
@@ -15,7 +15,7 @@
// saturn_rom_device - constructor
//-------------------------------------------------
-const device_type SATURN_ROM = &device_creator<saturn_rom_device>;
+const device_type SATURN_ROM = device_creator<saturn_rom_device>;
saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp
index 456b9af3d0f..a536ef23653 100644
--- a/src/devices/bus/saturn/sat_slot.cpp
+++ b/src/devices/bus/saturn/sat_slot.cpp
@@ -29,7 +29,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SATURN_CART_SLOT = &device_creator<sat_cart_slot_device>;
+const device_type SATURN_CART_SLOT = device_creator<sat_cart_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp
index 68604afce99..ddaccb9422f 100644
--- a/src/devices/bus/scsi/acb4070.cpp
+++ b/src/devices/bus/scsi/acb4070.cpp
@@ -9,7 +9,7 @@
#include "acb4070.h"
// device type definition
-const device_type ACB4070 = &device_creator<acb4070_device>;
+const device_type ACB4070 = device_creator<acb4070_device>;
acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__)
diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp
index 74dd8b281ae..f0de47e0da3 100644
--- a/src/devices/bus/scsi/cdu76s.cpp
+++ b/src/devices/bus/scsi/cdu76s.cpp
@@ -40,7 +40,7 @@ void sony_cdu76s_device::ReadData( uint8_t *data, int dataLength )
}
// device type definition
-const device_type CDU76S = &device_creator<sony_cdu76s_device>;
+const device_type CDU76S = device_creator<sony_cdu76s_device>;
sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__)
diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp
index 3ee1dc91365..3f3b4a70ce1 100644
--- a/src/devices/bus/scsi/d9060hd.cpp
+++ b/src/devices/bus/scsi/d9060hd.cpp
@@ -9,7 +9,7 @@
#include "d9060hd.h"
// device type definition
-const device_type D9060HD = &device_creator<d9060hd_device>;
+const device_type D9060HD = device_creator<d9060hd_device>;
d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__)
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index 274c66a1d3e..3dfcc783341 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -10,7 +10,7 @@
#define OMTI_READ_DATA_BUFFER 0xec
#define OMTI_ASSIGN_DISK_PARAM 0xc2
-const device_type OMTI5100 = &device_creator<omti5100_device>;
+const device_type OMTI5100 = device_creator<omti5100_device>;
#if 0
ROM_START( omti5100 )
diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp
index 9558897ce83..29d30b48589 100644
--- a/src/devices/bus/scsi/pc9801_sasi.cpp
+++ b/src/devices/bus/scsi/pc9801_sasi.cpp
@@ -5,7 +5,7 @@
#define SASI_CMD_SPECIFY 0xc2 // according to x68k_hdc.c
-const device_type PC9801_SASI = &device_creator<pc9801_sasi_device>;
+const device_type PC9801_SASI = device_creator<pc9801_sasi_device>;
pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__)
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index 8b80f4a0bfe..df49859b844 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -102,7 +102,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type S1410 = &device_creator<s1410_device>;
+const device_type S1410 = device_creator<s1410_device>;
//-------------------------------------------------
// ROM( s1410 )
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 011fd7761e0..76587f9f0ab 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SA1403D = &device_creator<sa1403d_device>;
+const device_type SA1403D = device_creator<sa1403d_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 3dda2983129..73118ee35ed 100644
--- a/src/devices/bus/scsi/scsi.cpp
+++ b/src/devices/bus/scsi/scsi.cpp
@@ -665,7 +665,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 )
}
}
-const device_type SCSI_PORT = &device_creator<SCSI_PORT_DEVICE>;
+const device_type SCSI_PORT = device_creator<SCSI_PORT_DEVICE>;
SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__),
@@ -700,7 +700,7 @@ void SCSI_PORT_SLOT_device::device_start()
{
}
-const device_type SCSI_PORT_SLOT = &device_creator<SCSI_PORT_SLOT_device>;
+const device_type SCSI_PORT_SLOT = device_creator<SCSI_PORT_SLOT_device>;
scsi_port_interface::scsi_port_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device)
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index 1f1a197a0b2..2c995bc54a3 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -10,7 +10,7 @@
#include "scsicd.h"
// device type definition
-const device_type SCSICD = &device_creator<scsicd_device>;
+const device_type SCSICD = device_creator<scsicd_device>;
scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
scsihle_device(mconfig, SCSICD, "SCSI CD", tag, owner, clock, "scsicd", __FILE__)
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index 12345bb87f8..b8aae0aa48e 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -10,7 +10,7 @@
#include "scsihd.h"
// device type definition
-const device_type SCSIHD = &device_creator<scsihd_device>;
+const device_type SCSIHD = device_creator<scsihd_device>;
scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihle_device(mconfig, SCSIHD, "SCSI HD", tag, owner, clock, "scsihd", __FILE__)
diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp
index ccf05a85d94..a4e42cf46fb 100644
--- a/src/devices/bus/scv/rom.cpp
+++ b/src/devices/bus/scv/rom.cpp
@@ -17,13 +17,13 @@
// scv_rom_device - constructor
//-------------------------------------------------
-const device_type SCV_ROM8K = &device_creator<scv_rom8_device>;
-const device_type SCV_ROM16K = &device_creator<scv_rom16_device>;
-const device_type SCV_ROM32K = &device_creator<scv_rom32_device>;
-const device_type SCV_ROM32K_RAM8K = &device_creator<scv_rom32ram8_device>;
-const device_type SCV_ROM64K = &device_creator<scv_rom64_device>;
-const device_type SCV_ROM128K = &device_creator<scv_rom128_device>;
-const device_type SCV_ROM128K_RAM4K = &device_creator<scv_rom128ram4_device>;
+const device_type SCV_ROM8K = device_creator<scv_rom8_device>;
+const device_type SCV_ROM16K = device_creator<scv_rom16_device>;
+const device_type SCV_ROM32K = device_creator<scv_rom32_device>;
+const device_type SCV_ROM32K_RAM8K = device_creator<scv_rom32ram8_device>;
+const device_type SCV_ROM64K = device_creator<scv_rom64_device>;
+const device_type SCV_ROM128K = device_creator<scv_rom128_device>;
+const device_type SCV_ROM128K_RAM4K = device_creator<scv_rom128ram4_device>;
scv_rom8_device::scv_rom8_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)
diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp
index a0b4c3a5900..f2f9642e0a0 100644
--- a/src/devices/bus/scv/slot.cpp
+++ b/src/devices/bus/scv/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SCV_CART_SLOT = &device_creator<scv_cart_slot_device>;
+const device_type SCV_CART_SLOT = device_creator<scv_cart_slot_device>;
//**************************************************************************
// SCV cartridges Interface
diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp
index 7c3c198adba..b8a8ffd3263 100644
--- a/src/devices/bus/sega8/ccatch.cpp
+++ b/src/devices/bus/sega8/ccatch.cpp
@@ -19,7 +19,7 @@
// constructors
//-------------------------------------------------
-const device_type SEGA8_ROM_CARDCATCH = &device_creator<sega8_cardcatch_device>;
+const device_type SEGA8_ROM_CARDCATCH = device_creator<sega8_cardcatch_device>;
diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp
index bb40fa73bd7..4cf05b340ec 100644
--- a/src/devices/bus/sega8/mgear.cpp
+++ b/src/devices/bus/sega8/mgear.cpp
@@ -21,7 +21,7 @@
// constructors
//-------------------------------------------------
-const device_type SEGA8_ROM_MGEAR = &device_creator<sega8_mgear_device>;
+const device_type SEGA8_ROM_MGEAR = device_creator<sega8_mgear_device>;
sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_MGEAR, "Master Gear Converter", tag, owner, clock, "sega8_mgear", __FILE__),
diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp
index aaa4ad0a02b..7ef04ca9c79 100644
--- a/src/devices/bus/sega8/rom.cpp
+++ b/src/devices/bus/sega8/rom.cpp
@@ -19,28 +19,28 @@
// Base cart type shared across SG-1000, SG-1000 Mark II, SG-1000 Mark III, SMS, GG
// even if in sg1000 rom banks are never changed and ram is never enabled
-const device_type SEGA8_ROM_STD = &device_creator<sega8_rom_device>;
+const device_type SEGA8_ROM_STD = device_creator<sega8_rom_device>;
// Specific SG-1000 MkI - MkII cart types
-const device_type SEGA8_ROM_OTHELLO = &device_creator<sega8_othello_device>;
-const device_type SEGA8_ROM_CASTLE = &device_creator<sega8_castle_device>;
-const device_type SEGA8_ROM_BASIC_L3 = &device_creator<sega8_basic_l3_device>;
-const device_type SEGA8_ROM_MUSIC_EDITOR = &device_creator<sega8_music_editor_device>;
-const device_type SEGA8_ROM_TEREBI = &device_creator<sega8_terebi_device>;
-const device_type SEGA8_ROM_DAHJEE_TYPEA = &device_creator<sega8_dahjee_typea_device>;
-const device_type SEGA8_ROM_DAHJEE_TYPEB = &device_creator<sega8_dahjee_typeb_device>;
+const device_type SEGA8_ROM_OTHELLO = device_creator<sega8_othello_device>;
+const device_type SEGA8_ROM_CASTLE = device_creator<sega8_castle_device>;
+const device_type SEGA8_ROM_BASIC_L3 = device_creator<sega8_basic_l3_device>;
+const device_type SEGA8_ROM_MUSIC_EDITOR = device_creator<sega8_music_editor_device>;
+const device_type SEGA8_ROM_TEREBI = device_creator<sega8_terebi_device>;
+const device_type SEGA8_ROM_DAHJEE_TYPEA = device_creator<sega8_dahjee_typea_device>;
+const device_type SEGA8_ROM_DAHJEE_TYPEB = device_creator<sega8_dahjee_typeb_device>;
// Specific SG-1000 MkIII - SMS - GG cart types
-const device_type SEGA8_ROM_EEPROM = &device_creator<sega8_eeprom_device>;
-const device_type SEGA8_ROM_CODEMASTERS = &device_creator<sega8_codemasters_device>;
-const device_type SEGA8_ROM_4PAK = &device_creator<sega8_4pak_device>;
-const device_type SEGA8_ROM_ZEMINA = &device_creator<sega8_zemina_device>;
-const device_type SEGA8_ROM_NEMESIS = &device_creator<sega8_nemesis_device>;
-const device_type SEGA8_ROM_JANGGUN = &device_creator<sega8_janggun_device>;
-const device_type SEGA8_ROM_HICOM = &device_creator<sega8_hicom_device>;
-const device_type SEGA8_ROM_KOREAN = &device_creator<sega8_korean_device>;
-const device_type SEGA8_ROM_KOREAN_NB = &device_creator<sega8_korean_nb_device>;
-const device_type SEGA8_ROM_SEOJIN = &device_creator<sega8_seojin_device>;
+const device_type SEGA8_ROM_EEPROM = device_creator<sega8_eeprom_device>;
+const device_type SEGA8_ROM_CODEMASTERS = device_creator<sega8_codemasters_device>;
+const device_type SEGA8_ROM_4PAK = device_creator<sega8_4pak_device>;
+const device_type SEGA8_ROM_ZEMINA = device_creator<sega8_zemina_device>;
+const device_type SEGA8_ROM_NEMESIS = device_creator<sega8_nemesis_device>;
+const device_type SEGA8_ROM_JANGGUN = device_creator<sega8_janggun_device>;
+const device_type SEGA8_ROM_HICOM = device_creator<sega8_hicom_device>;
+const device_type SEGA8_ROM_KOREAN = device_creator<sega8_korean_device>;
+const device_type SEGA8_ROM_KOREAN_NB = device_creator<sega8_korean_nb_device>;
+const device_type SEGA8_ROM_SEOJIN = device_creator<sega8_seojin_device>;
diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp
index 17216c1ec58..df5f882b3ed 100644
--- a/src/devices/bus/sega8/sega8_slot.cpp
+++ b/src/devices/bus/sega8/sega8_slot.cpp
@@ -37,8 +37,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SEGA8_CART_SLOT = &device_creator<sega8_cart_slot_device>;
-const device_type SEGA8_CARD_SLOT = &device_creator<sega8_card_slot_device>;
+const device_type SEGA8_CART_SLOT = device_creator<sega8_cart_slot_device>;
+const device_type SEGA8_CARD_SLOT = device_creator<sega8_card_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index ceca6077fe8..d4798944d58 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -47,7 +47,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SEGA_FM_UNIT = &device_creator<sega_fm_unit_device>;
+const device_type SEGA_FM_UNIT = device_creator<sega_fm_unit_device>;
static MACHINE_CONFIG_FRAGMENT( fm_config )
diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp
index 7c1fa1eea32..d926a4b7a3a 100644
--- a/src/devices/bus/sg1000_exp/sg1000exp.cpp
+++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SG1000_EXPANSION_SLOT = &device_creator<sg1000_expansion_slot_device>;
+const device_type SG1000_EXPANSION_SLOT = device_creator<sg1000_expansion_slot_device>;
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index b58757cbbc4..10df8f00ee1 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -27,7 +27,7 @@ TODO:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SEGA_SK1100 = &device_creator<sega_sk1100_device>;
+const device_type SEGA_SK1100 = device_creator<sega_sk1100_device>;
/*-------------------------------------------------
diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp
index db302cea668..6aba4cdcbfb 100644
--- a/src/devices/bus/sms_ctrl/graphic.cpp
+++ b/src/devices/bus/sms_ctrl/graphic.cpp
@@ -41,7 +41,7 @@ THen 2 nibbles are read to form a byte containing the absolute Y coordiante.
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_GRAPHIC = &device_creator<sms_graphic_device>;
+const device_type SMS_GRAPHIC = device_creator<sms_graphic_device>;
static INPUT_PORTS_START( sms_graphic )
diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp
index e9dba928346..2de1d1b13df 100644
--- a/src/devices/bus/sms_ctrl/joypad.cpp
+++ b/src/devices/bus/sms_ctrl/joypad.cpp
@@ -30,7 +30,7 @@ Release data from the Sega Retro project:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_JOYPAD = &device_creator<sms_joypad_device>;
+const device_type SMS_JOYPAD = device_creator<sms_joypad_device>;
static INPUT_PORTS_START( sms_joypad )
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index ce5abe36515..a6fec3a798f 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -21,13 +21,15 @@ Notes:
#include "emu.h"
#include "lphaser.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_LIGHT_PHASER = &device_creator<sms_light_phaser_device>;
+const device_type SMS_LIGHT_PHASER = device_creator<sms_light_phaser_device>;
#define LGUN_RADIUS 6
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index 9ea060fc491..355b05ffb46 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_MULTITAP = &device_creator<sms_multitap_device>;
+const device_type SMS_MULTITAP = device_creator<sms_multitap_device>;
//**************************************************************************
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index a5707d7f4fb..dbda3fe9740 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -32,7 +32,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_PADDLE = &device_creator<sms_paddle_device>;
+const device_type SMS_PADDLE = device_creator<sms_paddle_device>;
// time interval not verified
// Player 2 of Galactic Protector is the most sensible to this timming.
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index fa356a5cac6..434995a6fa7 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -28,7 +28,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_RAPID_FIRE = &device_creator<sms_rapid_fire_device>;
+const device_type SMS_RAPID_FIRE = device_creator<sms_rapid_fire_device>;
// time interval not verified
#define RAPID_FIRE_INTERVAL attotime::from_hz(10)
diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp
index c8551fd385f..0967ae723c3 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.cpp
+++ b/src/devices/bus/sms_ctrl/smsctrl.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SMS_CONTROL_PORT = &device_creator<sms_control_port_device>;
+const device_type SMS_CONTROL_PORT = device_creator<sms_control_port_device>;
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index d822d7be986..02e2f614bdc 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -47,7 +47,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_SPORTS_PAD = &device_creator<sms_sports_pad_device>;
+const device_type SMS_SPORTS_PAD = device_creator<sms_sports_pad_device>;
// time interval not verified
#define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/512)
diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp
index 3932e8645ff..9cf326009fa 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.cpp
+++ b/src/devices/bus/sms_ctrl/sportsjp.cpp
@@ -50,7 +50,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_SPORTS_PAD_JP = &device_creator<sms_sports_pad_jp_device>;
+const device_type SMS_SPORTS_PAD_JP = device_creator<sms_sports_pad_jp_device>;
// time interval not verified
#define SPORTS_PAD_JP_INTERVAL attotime::from_hz(20000)
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index 27b0f5f9863..0b1356db592 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -22,7 +22,7 @@ real hardware, when run plugged-in to the SMS expansion slot.
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SMS_GENDER_ADAPTER = &device_creator<sms_gender_adapter_device>;
+const device_type SMS_GENDER_ADAPTER = device_creator<sms_gender_adapter_device>;
diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp
index 2a1dd8673c8..12e4ebcc48d 100644
--- a/src/devices/bus/sms_exp/smsexp.cpp
+++ b/src/devices/bus/sms_exp/smsexp.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SMS_EXPANSION_SLOT = &device_creator<sms_expansion_slot_device>;
+const device_type SMS_EXPANSION_SLOT = device_creator<sms_expansion_slot_device>;
diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp
index 569f538b590..a81aeac02b6 100644
--- a/src/devices/bus/snes/bsx.cpp
+++ b/src/devices/bus/snes/bsx.cpp
@@ -18,10 +18,10 @@
// sns_rom_bsx_device - constructor
//-------------------------------------------------
-const device_type SNS_ROM_BSX = &device_creator<sns_rom_bsx_device>;
-const device_type SNS_LOROM_BSX = &device_creator<sns_rom_bsxlo_device>;
-const device_type SNS_HIROM_BSX = &device_creator<sns_rom_bsxhi_device>;
-const device_type SNS_BSMEMPAK = &device_creator<sns_rom_bsmempak_device>;
+const device_type SNS_ROM_BSX = device_creator<sns_rom_bsx_device>;
+const device_type SNS_LOROM_BSX = device_creator<sns_rom_bsxlo_device>;
+const device_type SNS_HIROM_BSX = device_creator<sns_rom_bsxhi_device>;
+const device_type SNS_BSMEMPAK = device_creator<sns_rom_bsmempak_device>;
sns_rom_bsx_device::sns_rom_bsx_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)
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index adec0e45002..6b65443ab11 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -17,7 +17,7 @@
// sns_rom_device - constructor
//-------------------------------------------------
-const device_type SNS_PFEST94 = &device_creator<sns_pfest94_device>;
+const device_type SNS_PFEST94 = device_creator<sns_pfest94_device>;
sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp
index 1eed877ce83..9cd44aa7d41 100644
--- a/src/devices/bus/snes/rom.cpp
+++ b/src/devices/bus/snes/rom.cpp
@@ -15,18 +15,18 @@
// sns_rom_device - constructor
//-------------------------------------------------
-const device_type SNS_LOROM = &device_creator<sns_rom_device>;
-const device_type SNS_LOROM_OBC1 = &device_creator<sns_rom_obc1_device>;
+const device_type SNS_LOROM = device_creator<sns_rom_device>;
+const device_type SNS_LOROM_OBC1 = device_creator<sns_rom_obc1_device>;
// LoROM pirate carts with protection
-const device_type SNS_LOROM_POKEMON = &device_creator<sns_rom_pokemon_device>;
-const device_type SNS_LOROM_TEKKEN2 = &device_creator<sns_rom_tekken2_device>;
-const device_type SNS_LOROM_SOULBLAD = &device_creator<sns_rom_soulblad_device>;
-const device_type SNS_LOROM_BANANA = &device_creator<sns_rom_banana_device>;
-const device_type SNS_LOROM_BUGSLIFE = &device_creator<sns_rom_bugs_device>;
+const device_type SNS_LOROM_POKEMON = device_creator<sns_rom_pokemon_device>;
+const device_type SNS_LOROM_TEKKEN2 = device_creator<sns_rom_tekken2_device>;
+const device_type SNS_LOROM_SOULBLAD = device_creator<sns_rom_soulblad_device>;
+const device_type SNS_LOROM_BANANA = device_creator<sns_rom_banana_device>;
+const device_type SNS_LOROM_BUGSLIFE = device_creator<sns_rom_bugs_device>;
// LoROM pirate multicarts
-const device_type SNS_LOROM_MCPIR1 = &device_creator<sns_rom_mcpirate1_device>;
-const device_type SNS_LOROM_MCPIR2 = &device_creator<sns_rom_mcpirate2_device>;
-const device_type SNS_LOROM_20COL = &device_creator<sns_rom_20col_device>;
+const device_type SNS_LOROM_MCPIR1 = device_creator<sns_rom_mcpirate1_device>;
+const device_type SNS_LOROM_MCPIR2 = device_creator<sns_rom_mcpirate2_device>;
+const device_type SNS_LOROM_20COL = device_creator<sns_rom_20col_device>;
sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp
index 78db94492d8..d4a555da852 100644
--- a/src/devices/bus/snes/rom21.cpp
+++ b/src/devices/bus/snes/rom21.cpp
@@ -15,8 +15,8 @@
// sns_rom_device - constructor
//-------------------------------------------------
-const device_type SNS_HIROM = &device_creator<sns_rom21_device>;
-const device_type SNS_HIROM_SRTC = &device_creator<sns_rom21_srtc_device>;
+const device_type SNS_HIROM = device_creator<sns_rom21_device>;
+const device_type SNS_HIROM_SRTC = device_creator<sns_rom21_srtc_device>;
sns_rom21_device::sns_rom21_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)
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index 86363038992..f74ebe4409a 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -82,7 +82,7 @@
// constructor
//-------------------------------------------------
-const device_type SNS_LOROM_SA1 = &device_creator<sns_sa1_device>;
+const device_type SNS_LOROM_SA1 = device_creator<sns_sa1_device>;
sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp
index e1f870d5ff4..cddff2082f4 100644
--- a/src/devices/bus/snes/sdd1.cpp
+++ b/src/devices/bus/snes/sdd1.cpp
@@ -408,7 +408,7 @@ void SDD1_emu::SDD1emu_decompress(uint8_t *ROM, uint32_t *mmc, uint32_t in_buf,
// sns_rom_sdd1_device - constructor
//-------------------------------------------------
-const device_type SNS_LOROM_SDD1 = &device_creator<sns_rom_sdd1_device>;
+const device_type SNS_LOROM_SDD1 = device_creator<sns_rom_sdd1_device>;
sns_rom_sdd1_device::sns_rom_sdd1_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)
diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp
index e44042de962..090408c77f4 100644
--- a/src/devices/bus/snes/sfx.cpp
+++ b/src/devices/bus/snes/sfx.cpp
@@ -15,7 +15,7 @@
// sns_rom_superfx_device - constructor
//-------------------------------------------------
-const device_type SNS_LOROM_SUPERFX = &device_creator<sns_rom_superfx_device>;
+const device_type SNS_LOROM_SUPERFX = device_creator<sns_rom_superfx_device>;
sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index d61281952b6..bbf3e804a2a 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -19,8 +19,8 @@
// sns_rom_sgb_device - constructor
//-------------------------------------------------
-const device_type SNS_LOROM_SUPERGB = &device_creator<sns_rom_sgb1_device>;
-const device_type SNS_LOROM_SUPERGB2 = &device_creator<sns_rom_sgb2_device>;
+const device_type SNS_LOROM_SUPERGB = device_creator<sns_rom_sgb1_device>;
+const device_type SNS_LOROM_SUPERGB2 = device_creator<sns_rom_sgb2_device>;
sns_rom_sgb_device::sns_rom_sgb_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)
diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp
index 10bf17645f6..e5865de5ab5 100644
--- a/src/devices/bus/snes/snes_slot.cpp
+++ b/src/devices/bus/snes/snes_slot.cpp
@@ -56,9 +56,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SNS_CART_SLOT = &device_creator<sns_cart_slot_device>;
-const device_type SNS_SUFAMI_CART_SLOT = &device_creator<sns_sufami_cart_slot_device>;
-const device_type SNS_BSX_CART_SLOT = &device_creator<sns_bsx_cart_slot_device>;
+const device_type SNS_CART_SLOT = device_creator<sns_cart_slot_device>;
+const device_type SNS_SUFAMI_CART_SLOT = device_creator<sns_sufami_cart_slot_device>;
+const device_type SNS_BSX_CART_SLOT = device_creator<sns_bsx_cart_slot_device>;
//**************************************************************************
// SNES Cartridge Interface
diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp
index 1a611146366..61cc7ed99c7 100644
--- a/src/devices/bus/snes/spc7110.cpp
+++ b/src/devices/bus/snes/spc7110.cpp
@@ -20,8 +20,8 @@
// constructor
//-------------------------------------------------
-const device_type SNS_HIROM_SPC7110 = &device_creator<sns_rom_spc7110_device>;
-const device_type SNS_HIROM_SPC7110_RTC = &device_creator<sns_rom_spc7110rtc_device>;
+const device_type SNS_HIROM_SPC7110 = device_creator<sns_rom_spc7110_device>;
+const device_type SNS_HIROM_SPC7110_RTC = device_creator<sns_rom_spc7110rtc_device>;
sns_rom_spc7110_device::sns_rom_spc7110_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)
diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp
index c181c5cde95..782e8669f13 100644
--- a/src/devices/bus/snes/sufami.cpp
+++ b/src/devices/bus/snes/sufami.cpp
@@ -20,8 +20,8 @@
// sns_rom_sufami_device - constructor
//-------------------------------------------------
-const device_type SNS_LOROM_SUFAMI = &device_creator<sns_rom_sufami_device>;
-const device_type SNS_STROM = &device_creator<sns_rom_strom_device>;
+const device_type SNS_LOROM_SUFAMI = device_creator<sns_rom_sufami_device>;
+const device_type SNS_STROM = device_creator<sns_rom_strom_device>;
sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp
index 25cd416e8b1..315d6a0775c 100644
--- a/src/devices/bus/snes/upd.cpp
+++ b/src/devices/bus/snes/upd.cpp
@@ -26,10 +26,10 @@ inline uint16_t get_data(uint8_t *CPU, uint32_t addr)
// constructor
//-------------------------------------------------
-const device_type SNS_LOROM_NECDSP = &device_creator<sns_rom20_necdsp_device>;
-const device_type SNS_HIROM_NECDSP = &device_creator<sns_rom21_necdsp_device>;
-const device_type SNS_LOROM_SETA10 = &device_creator<sns_rom_seta10dsp_device>;
-const device_type SNS_LOROM_SETA11 = &device_creator<sns_rom_seta11dsp_device>;
+const device_type SNS_LOROM_NECDSP = device_creator<sns_rom20_necdsp_device>;
+const device_type SNS_HIROM_NECDSP = device_creator<sns_rom21_necdsp_device>;
+const device_type SNS_LOROM_SETA10 = device_creator<sns_rom_seta10dsp_device>;
+const device_type SNS_LOROM_SETA11 = device_creator<sns_rom_seta11dsp_device>;
sns_rom20_necdsp_device::sns_rom20_necdsp_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)
@@ -398,14 +398,14 @@ void sns_rom_setadsp_device::speedup_addon_bios_access()
// Legacy versions including DSP dump roms, in order to support faulty dumps missing DSP data...
-const device_type SNS_LOROM_NECDSP1_LEG = &device_creator<sns_rom20_necdsp1_legacy_device>;
-const device_type SNS_LOROM_NECDSP1B_LEG = &device_creator<sns_rom20_necdsp1b_legacy_device>;
-const device_type SNS_LOROM_NECDSP2_LEG = &device_creator<sns_rom20_necdsp2_legacy_device>;
-const device_type SNS_LOROM_NECDSP3_LEG = &device_creator<sns_rom20_necdsp3_legacy_device>;
-const device_type SNS_LOROM_NECDSP4_LEG = &device_creator<sns_rom20_necdsp4_legacy_device>;
-const device_type SNS_HIROM_NECDSP1_LEG = &device_creator<sns_rom21_necdsp1_legacy_device>;
-const device_type SNS_LOROM_SETA10_LEG = &device_creator<sns_rom_seta10dsp_legacy_device>;
-const device_type SNS_LOROM_SETA11_LEG = &device_creator<sns_rom_seta11dsp_legacy_device>;
+const device_type SNS_LOROM_NECDSP1_LEG = device_creator<sns_rom20_necdsp1_legacy_device>;
+const device_type SNS_LOROM_NECDSP1B_LEG = device_creator<sns_rom20_necdsp1b_legacy_device>;
+const device_type SNS_LOROM_NECDSP2_LEG = device_creator<sns_rom20_necdsp2_legacy_device>;
+const device_type SNS_LOROM_NECDSP3_LEG = device_creator<sns_rom20_necdsp3_legacy_device>;
+const device_type SNS_LOROM_NECDSP4_LEG = device_creator<sns_rom20_necdsp4_legacy_device>;
+const device_type SNS_HIROM_NECDSP1_LEG = device_creator<sns_rom21_necdsp1_legacy_device>;
+const device_type SNS_LOROM_SETA10_LEG = device_creator<sns_rom_seta10dsp_legacy_device>;
+const device_type SNS_LOROM_SETA11_LEG = device_creator<sns_rom_seta11dsp_legacy_device>;
sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp
index faf63e91515..0195bf0fe6b 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/snes_ctrl/bcbattle.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_BARCODE_BATTLER = &device_creator<snes_bcbattle_device>;
+const device_type SNES_BARCODE_BATTLER = device_creator<snes_bcbattle_device>;
MACHINE_CONFIG_FRAGMENT( snes_battler )
diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp
index b098a7237ff..53383c13ce7 100644
--- a/src/devices/bus/snes_ctrl/ctrl.cpp
+++ b/src/devices/bus/snes_ctrl/ctrl.cpp
@@ -23,7 +23,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SNES_CONTROL_PORT = &device_creator<snes_control_port_device>;
+const device_type SNES_CONTROL_PORT = device_creator<snes_control_port_device>;
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp
index 11b965bed77..b31e8e1d36d 100644
--- a/src/devices/bus/snes_ctrl/joypad.cpp
+++ b/src/devices/bus/snes_ctrl/joypad.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_JOYPAD = &device_creator<snes_joypad_device>;
+const device_type SNES_JOYPAD = device_creator<snes_joypad_device>;
static INPUT_PORTS_START( snes_joypad )
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index 36d6af3362b..94e4e567e91 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -20,7 +20,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_MIRACLE = &device_creator<snes_miracle_device>;
+const device_type SNES_MIRACLE = device_creator<snes_miracle_device>;
MACHINE_CONFIG_FRAGMENT( snes_miracle )
diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp
index 47806ea0845..acd8892518f 100644
--- a/src/devices/bus/snes_ctrl/mouse.cpp
+++ b/src/devices/bus/snes_ctrl/mouse.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_MOUSE = &device_creator<snes_mouse_device>;
+const device_type SNES_MOUSE = device_creator<snes_mouse_device>;
static INPUT_PORTS_START( snes_mouse )
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index 062486bbcf5..0639e24c8db 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_MULTITAP = &device_creator<snes_multitap_device>;
+const device_type SNES_MULTITAP = device_creator<snes_multitap_device>;
static INPUT_PORTS_START( snes_multitap )
diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp
index 551176959aa..d80b862fb33 100644
--- a/src/devices/bus/snes_ctrl/pachinko.cpp
+++ b/src/devices/bus/snes_ctrl/pachinko.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_PACHINKO = &device_creator<snes_pachinko_device>;
+const device_type SNES_PACHINKO = device_creator<snes_pachinko_device>;
static INPUT_PORTS_START( snes_pachinko )
diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp
index fbdbb5a93c4..9b7ee0c053f 100644
--- a/src/devices/bus/snes_ctrl/sscope.cpp
+++ b/src/devices/bus/snes_ctrl/sscope.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_SUPERSCOPE = &device_creator<snes_sscope_device>;
+const device_type SNES_SUPERSCOPE = device_creator<snes_sscope_device>;
static INPUT_PORTS_START( snes_sscope )
diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp
index 81a9937e819..ef4bdc8e260 100644
--- a/src/devices/bus/snes_ctrl/twintap.cpp
+++ b/src/devices/bus/snes_ctrl/twintap.cpp
@@ -20,7 +20,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_TWINTAP = &device_creator<snes_twintap_device>;
+const device_type SNES_TWINTAP = device_creator<snes_twintap_device>;
static INPUT_PORTS_START( snes_twintap )
diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp
index b90c59ecc93..c0f8d6555fb 100644
--- a/src/devices/bus/spc1000/exp.cpp
+++ b/src/devices/bus/spc1000/exp.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SPC1000_EXP_SLOT = &device_creator<spc1000_exp_device>;
+const device_type SPC1000_EXP_SLOT = device_creator<spc1000_exp_device>;
device_spc1000_card_interface::device_spc1000_card_interface(const machine_config &mconfig, device_t &device)
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 13a32cfb808..b724538c9da 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -124,7 +124,7 @@ const tiny_rom_entry *spc1000_fdd_exp_device::device_rom_region() const
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SPC1000_FDD_EXP = &device_creator<spc1000_fdd_exp_device>;
+const device_type SPC1000_FDD_EXP = device_creator<spc1000_fdd_exp_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index 0f055ef6382..70a2c497e3d 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -42,7 +42,7 @@ machine_config_constructor spc1000_vdp_exp_device::device_mconfig_additions() co
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SPC1000_VDP_EXP = &device_creator<spc1000_vdp_exp_device>;
+const device_type SPC1000_VDP_EXP = device_creator<spc1000_vdp_exp_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index fe5f519d0b2..9a289375fd9 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -4,6 +4,7 @@
#include "hlekbd.h"
#include "machine/keyboard.ipp"
+#include "speaker.h"
/*
@@ -135,12 +136,12 @@
DEVICE TYPE GLOBALS
***************************************************************************/
-device_type const SUN_TYPE3_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type3_device>;
-device_type const SUN_TYPE4_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type4_device>;
-device_type const SUN_TYPE5_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type5_device>;
-device_type const SUN_TYPE5_GB_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type5_gb_device>;
-device_type const SUN_TYPE5_SE_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type5_se_device>;
-device_type const SUN_TYPE5_JP_HLE_KEYBOARD = &device_creator<bus::sunkbd::hle_type5_jp_device>;
+device_type const SUN_TYPE3_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type3_device>;
+device_type const SUN_TYPE4_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type4_device>;
+device_type const SUN_TYPE5_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type5_device>;
+device_type const SUN_TYPE5_GB_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type5_gb_device>;
+device_type const SUN_TYPE5_SE_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type5_se_device>;
+device_type const SUN_TYPE5_JP_HLE_KEYBOARD = device_creator<bus::sunkbd::hle_type5_jp_device>;
diff --git a/src/devices/bus/sunkbd/sunkbd.cpp b/src/devices/bus/sunkbd/sunkbd.cpp
index 62d5680c397..2809bef5b16 100644
--- a/src/devices/bus/sunkbd/sunkbd.cpp
+++ b/src/devices/bus/sunkbd/sunkbd.cpp
@@ -5,7 +5,7 @@
#include "sunkbd.h"
-device_type const SUNKBD_PORT = &device_creator<sun_keyboard_port_device>;
+device_type const SUNKBD_PORT = device_creator<sun_keyboard_port_device>;
int const device_sun_keyboard_port_interface::START_BIT_COUNT;
diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp
index 6ddb23e8bb9..6b54b620f6f 100644
--- a/src/devices/bus/svi3x8/expander/expander.cpp
+++ b/src/devices/bus/svi3x8/expander/expander.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SVI_EXPANDER = &device_creator<svi_expander_device>;
+const device_type SVI_EXPANDER = device_creator<svi_expander_device>;
//**************************************************************************
diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp
index d97b114f1f5..e7fe68b608b 100644
--- a/src/devices/bus/svi3x8/expander/sv601.cpp
+++ b/src/devices/bus/svi3x8/expander/sv601.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV601 = &device_creator<sv601_device>;
+const device_type SV601 = device_creator<sv601_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp
index 1c5f4b6b93c..119ec066544 100644
--- a/src/devices/bus/svi3x8/expander/sv602.cpp
+++ b/src/devices/bus/svi3x8/expander/sv602.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV602 = &device_creator<sv602_device>;
+const device_type SV602 = device_creator<sv602_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index af7bae0ee25..c0e4e16fdd2 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -8,14 +8,16 @@
#include "emu.h"
#include "sv603.h"
+
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV603 = &device_creator<sv603_device>;
+const device_type SV603 = device_creator<sv603_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp
index 7dc9bb8be95..8294369bb55 100644
--- a/src/devices/bus/svi3x8/slot/slot.cpp
+++ b/src/devices/bus/svi3x8/slot/slot.cpp
@@ -14,7 +14,7 @@
// SLOT BUS DEVICE
//**************************************************************************
-const device_type SVI_SLOT_BUS = &device_creator<svi_slot_bus_device>;
+const device_type SVI_SLOT_BUS = device_creator<svi_slot_bus_device>;
//-------------------------------------------------
// svi_slot_bus_device - constructor
@@ -198,7 +198,7 @@ WRITE_LINE_MEMBER( svi_slot_bus_device::bk32_w )
// SVI SLOT DEVICE
//**************************************************************************
-const device_type SVI_SLOT = &device_creator<svi_slot_device>;
+const device_type SVI_SLOT = device_creator<svi_slot_device>;
//-------------------------------------------------
// svi_slot_device - constructor
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index 396d99ed56b..32234dc2a61 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV801 = &device_creator<sv801_device>;
+const device_type SV801 = device_creator<sv801_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index d0fe46f946e..11e7dd6bbe3 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV802 = &device_creator<sv802_device>;
+const device_type SV802 = device_creator<sv802_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp
index 088e2ae5064..b67764ddd24 100644
--- a/src/devices/bus/svi3x8/slot/sv803.cpp
+++ b/src/devices/bus/svi3x8/slot/sv803.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV803 = &device_creator<sv803_device>;
+const device_type SV803 = device_creator<sv803_device>;
//**************************************************************************
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index 3ef1081c58c..b681d8d1cc6 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV805 = &device_creator<sv805_device>;
+const device_type SV805 = device_creator<sv805_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp
index e1047e143a9..c4ff1cc6c62 100644
--- a/src/devices/bus/svi3x8/slot/sv806.cpp
+++ b/src/devices/bus/svi3x8/slot/sv806.cpp
@@ -9,12 +9,14 @@
#include "emu.h"
#include "sv806.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV806 = &device_creator<sv806_device>;
+const device_type SV806 = device_creator<sv806_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp
index 99675199b93..faaea4c5a7e 100644
--- a/src/devices/bus/svi3x8/slot/sv807.cpp
+++ b/src/devices/bus/svi3x8/slot/sv807.cpp
@@ -28,7 +28,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SV807 = &device_creator<sv807_device>;
+const device_type SV807 = device_creator<sv807_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp
index d2a04e0c6d0..24351813a93 100644
--- a/src/devices/bus/ti99_peb/bwg.cpp
+++ b/src/devices/bus/ti99_peb/bwg.cpp
@@ -728,4 +728,4 @@ const tiny_rom_entry *snug_bwg_device::device_rom_region() const
return ROM_NAME( bwg_fdc );
}
-const device_type TI99_BWG = &device_creator<snug_bwg_device>;
+const device_type TI99_BWG = device_creator<snug_bwg_device>;
diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp
index d8b3bc79934..fe049d02036 100644
--- a/src/devices/bus/ti99_peb/evpc.cpp
+++ b/src/devices/bus/ti99_peb/evpc.cpp
@@ -38,6 +38,9 @@
#include "emu.h"
#include "evpc.h"
+#include "speaker.h"
+
+
#define EVPC_CRU_BASE 0x1400
#define TRACE_ADDRESS 0
@@ -477,4 +480,4 @@ machine_config_constructor snug_enhanced_video_device::device_mconfig_additions(
return MACHINE_CONFIG_NAME( ti99_evpc );
}
-const device_type TI99_EVPC = &device_creator<snug_enhanced_video_device>;
+const device_type TI99_EVPC = device_creator<snug_enhanced_video_device>;
diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp
index f3ea9740a16..7599c15b0bf 100644
--- a/src/devices/bus/ti99_peb/hfdc.cpp
+++ b/src/devices/bus/ti99_peb/hfdc.cpp
@@ -1113,4 +1113,4 @@ ioport_constructor myarc_hfdc_device::device_input_ports() const
return INPUT_PORTS_NAME( ti99_hfdc );
}
-const device_type TI99_HFDC = &device_creator<myarc_hfdc_device>;
+const device_type TI99_HFDC = device_creator<myarc_hfdc_device>;
diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp
index 0c3d92256dd..434fcdf2c6a 100644
--- a/src/devices/bus/ti99_peb/horizon.cpp
+++ b/src/devices/bus/ti99_peb/horizon.cpp
@@ -491,4 +491,4 @@ ioport_constructor horizon_ramdisk_device::device_input_ports() const
return INPUT_PORTS_NAME(horizon);
}
-const device_type TI99_HORIZON = &device_creator<horizon_ramdisk_device>;
+const device_type TI99_HORIZON = device_creator<horizon_ramdisk_device>;
diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp
index 2ab258132c2..f53190ebbbf 100644
--- a/src/devices/bus/ti99_peb/hsgpl.cpp
+++ b/src/devices/bus/ti99_peb/hsgpl.cpp
@@ -714,4 +714,4 @@ ioport_constructor snug_high_speed_gpl_device::device_input_ports() const
return INPUT_PORTS_NAME(ti99_hsgpl);
}
-const device_type TI99_HSGPL = &device_creator<snug_high_speed_gpl_device>;
+const device_type TI99_HSGPL = device_creator<snug_high_speed_gpl_device>;
diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp
index 1d1f4642189..f0a3dffbee7 100644
--- a/src/devices/bus/ti99_peb/memex.cpp
+++ b/src/devices/bus/ti99_peb/memex.cpp
@@ -158,4 +158,4 @@ ioport_constructor geneve_memex_device::device_input_ports() const
return INPUT_PORTS_NAME( memex );
}
-const device_type TI99_MEMEX = &device_creator<geneve_memex_device>;
+const device_type TI99_MEMEX = device_creator<geneve_memex_device>;
diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp
index 7eda7188727..5c1496279f8 100644
--- a/src/devices/bus/ti99_peb/myarcmem.cpp
+++ b/src/devices/bus/ti99_peb/myarcmem.cpp
@@ -211,4 +211,4 @@ ioport_constructor myarc_memory_expansion_device::device_input_ports() const
return INPUT_PORTS_NAME(myarc_exp);
}
-const device_type TI99_MYARCMEM = &device_creator<myarc_memory_expansion_device>;
+const device_type TI99_MYARCMEM = device_creator<myarc_memory_expansion_device>;
diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp
index 7165d7fb788..d86f46e3b5f 100644
--- a/src/devices/bus/ti99_peb/pcode.cpp
+++ b/src/devices/bus/ti99_peb/pcode.cpp
@@ -373,4 +373,4 @@ ioport_constructor ti_pcode_card_device::device_input_ports() const
return INPUT_PORTS_NAME( ti99_pcode );
}
-const device_type TI99_P_CODE = &device_creator<ti_pcode_card_device>;
+const device_type TI99_P_CODE = device_creator<ti_pcode_card_device>;
diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp
index 34190757fb4..de124051046 100644
--- a/src/devices/bus/ti99_peb/peribox.cpp
+++ b/src/devices/bus/ti99_peb/peribox.cpp
@@ -757,10 +757,10 @@ WRITE_LINE_MEMBER( peribox_slot_device::set_ready )
}
/***************************************************************************/
-const device_type PERIBOX = &device_creator<peribox_device>;
-const device_type PERIBOX_SLOT = &device_creator<peribox_slot_device>;
+const device_type PERIBOX = device_creator<peribox_device>;
+const device_type PERIBOX_SLOT = device_creator<peribox_slot_device>;
-const device_type PERIBOX_EV = &device_creator<peribox_ev_device>;
-const device_type PERIBOX_SG = &device_creator<peribox_sg_device>;
-const device_type PERIBOX_GEN = &device_creator<peribox_gen_device>;
-const device_type PERIBOX_998 = &device_creator<peribox_998_device>;
+const device_type PERIBOX_EV = device_creator<peribox_ev_device>;
+const device_type PERIBOX_SG = device_creator<peribox_sg_device>;
+const device_type PERIBOX_GEN = device_creator<peribox_gen_device>;
+const device_type PERIBOX_998 = device_creator<peribox_998_device>;
diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp
index 902db88675a..b0b51f90280 100644
--- a/src/devices/bus/ti99_peb/samsmem.cpp
+++ b/src/devices/bus/ti99_peb/samsmem.cpp
@@ -133,4 +133,4 @@ void sams_memory_expansion_device::device_reset()
for (auto & elem : m_mapper) elem = 0;
}
-const device_type TI99_SAMSMEM = &device_creator<sams_memory_expansion_device>;
+const device_type TI99_SAMSMEM = device_creator<sams_memory_expansion_device>;
diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp
index 99168e0eeb2..1a0ce1483e9 100644
--- a/src/devices/bus/ti99_peb/spchsyn.cpp
+++ b/src/devices/bus/ti99_peb/spchsyn.cpp
@@ -23,8 +23,11 @@
#include "emu.h"
#include "spchsyn.h"
-#include "sound/wave.h"
+
#include "machine/spchrom.h"
+#include "sound/wave.h"
+#include "speaker.h"
+
#define TRACE_MEM 0
#define TRACE_ADDR 0
@@ -171,4 +174,4 @@ const tiny_rom_entry *ti_speech_synthesizer_device::device_rom_region() const
{
return ROM_NAME( ti99_speech );
}
-const device_type TI99_SPEECH = &device_creator<ti_speech_synthesizer_device>;
+const device_type TI99_SPEECH = device_creator<ti_speech_synthesizer_device>;
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp
index 082c85c0e61..b86b35e2ca6 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.cpp
+++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp
@@ -107,4 +107,4 @@ machine_config_constructor ti_32k_expcard_device::device_mconfig_additions() con
return MACHINE_CONFIG_NAME( mem32k );
}
-const device_type TI_32KMEM = &device_creator<ti_32k_expcard_device>;
+const device_type TI_32KMEM = device_creator<ti_32k_expcard_device>;
diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp
index c8d71dbd9a4..c4bf5e2c19c 100644
--- a/src/devices/bus/ti99_peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99_peb/ti_fdc.cpp
@@ -478,4 +478,4 @@ const tiny_rom_entry *ti_fdc_device::device_rom_region() const
return ROM_NAME( ti_fdc );
}
-const device_type TI99_FDC = &device_creator<ti_fdc_device>;
+const device_type TI99_FDC = device_creator<ti_fdc_device>;
diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp
index 97eaef541ad..2a786440502 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99_peb/ti_rs232.cpp
@@ -1155,6 +1155,6 @@ ioport_constructor ti_rs232_pio_device::device_input_ports() const
return INPUT_PORTS_NAME(ti_rs232);
}
-const device_type TI99_RS232 = &device_creator<ti_rs232_pio_device>;
-const device_type TI99_RS232_DEV = &device_creator<ti_rs232_attached_device>;
-const device_type TI99_PIO_DEV = &device_creator<ti_pio_attached_device>;
+const device_type TI99_RS232 = device_creator<ti_rs232_pio_device>;
+const device_type TI99_RS232_DEV = device_creator<ti_rs232_attached_device>;
+const device_type TI99_PIO_DEV = device_creator<ti_pio_attached_device>;
diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp
index dfe277ea6df..be9ba36aad2 100644
--- a/src/devices/bus/ti99_peb/tn_ide.cpp
+++ b/src/devices/bus/ti99_peb/tn_ide.cpp
@@ -384,4 +384,4 @@ ioport_constructor nouspikel_ide_interface_device::device_input_ports() const
return INPUT_PORTS_NAME(tn_ide);
}
-const device_type TI99_IDE = &device_creator<nouspikel_ide_interface_device>;
+const device_type TI99_IDE = device_creator<nouspikel_ide_interface_device>;
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp
index 185acaeb0c3..b16126b9eec 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp
@@ -376,4 +376,4 @@ ioport_constructor nouspikel_usb_smartmedia_device::device_input_ports() const
return INPUT_PORTS_NAME(tn_usbsm);
}
-const device_type TI99_USBSM = &device_creator<nouspikel_usb_smartmedia_device>;
+const device_type TI99_USBSM = device_creator<nouspikel_usb_smartmedia_device>;
diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp
index a68253adff5..a6a16ba46fb 100644
--- a/src/devices/bus/ti99x/990_dk.cpp
+++ b/src/devices/bus/ti99x/990_dk.cpp
@@ -40,7 +40,7 @@ enum
status_unit_shift = 13
};
-const device_type FD800 = &device_creator<fd800_legacy_device>;
+const device_type FD800 = device_creator<fd800_legacy_device>;
fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__),
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp
index 7882a8f37e3..46695114294 100644
--- a/src/devices/bus/ti99x/990_hd.cpp
+++ b/src/devices/bus/ti99x/990_hd.cpp
@@ -974,7 +974,7 @@ static MACHINE_CONFIG_FRAGMENT( ti990_hdc )
MCFG_HARDDISK_UNLOAD(ti990_hdc_device, ti990_hd)
MACHINE_CONFIG_END
-const device_type TI990_HDC = &device_creator<ti990_hdc_device>;
+const device_type TI990_HDC = device_creator<ti990_hdc_device>;
ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_HDC, "Generic TI-990 Hard Disk Controller", tag, owner, clock, "hdc_990", __FILE__),
diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp
index 7ab14725f19..1613c92b830 100644
--- a/src/devices/bus/ti99x/990_tap.cpp
+++ b/src/devices/bus/ti99x/990_tap.cpp
@@ -914,7 +914,7 @@ private:
int tape_get_id();
};
-const device_type TI990_TAPE = &device_creator<ti990_tape_image_device>;
+const device_type TI990_TAPE = device_creator<ti990_tape_image_device>;
ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_TAPE, "TI-990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__),
@@ -974,7 +974,7 @@ static MACHINE_CONFIG_FRAGMENT( tap_990 )
MCFG_TI990_TAPE_ADD("tape3")
MACHINE_CONFIG_END
-const device_type TI990_TAPE_CTRL = &device_creator<tap_990_device>;
+const device_type TI990_TAPE_CTRL = device_creator<tap_990_device>;
tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_TAPE_CTRL, "Generic TI-990 Tape Controller", tag, owner, clock, "tap_990", __FILE__),
diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp
index 681bacda9d8..9342c3d8ae2 100644
--- a/src/devices/bus/ti99x/998board.cpp
+++ b/src/devices/bus/ti99x/998board.cpp
@@ -839,7 +839,7 @@ machine_config_constructor mainboard8_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( ti998_mainboard );
}
-const device_type MAINBOARD8 = &device_creator<mainboard8_device>;
+const device_type MAINBOARD8 = device_creator<mainboard8_device>;
/***************************************************************************
@@ -1335,7 +1335,7 @@ void video_waitstate_generator::clock_in(line_state clkout)
}
}
-const device_type VAQUERRO = &device_creator<vaquerro_device>;
+const device_type VAQUERRO = device_creator<vaquerro_device>;
/***************************************************************************
===== MOFETTA: Physical Address Space decoder =====
@@ -1583,7 +1583,7 @@ void mofetta_device::device_reset()
}
-const device_type MOFETTA = &device_creator<mofetta_device>;
+const device_type MOFETTA = device_creator<mofetta_device>;
/***************************************************************************
@@ -1939,7 +1939,7 @@ void amigo_device::device_reset()
m_logical_space = true;
}
-const device_type AMIGO = &device_creator<amigo_device>;
+const device_type AMIGO = device_creator<amigo_device>;
/***************************************************************************
@@ -2078,4 +2078,4 @@ void oso_device::device_start()
save_item(NAME(m_xmit));
}
-const device_type OSO = &device_creator<oso_device>;
+const device_type OSO = device_creator<oso_device>;
diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp
index 34f25a89c91..98a0791250c 100644
--- a/src/devices/bus/ti99x/datamux.cpp
+++ b/src/devices/bus/ti99x/datamux.cpp
@@ -634,4 +634,4 @@ ioport_constructor ti99_datamux_device::device_input_ports() const
return INPUT_PORTS_NAME(datamux);
}
-const device_type DATAMUX = &device_creator<ti99_datamux_device>;
+const device_type DATAMUX = device_creator<ti99_datamux_device>;
diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp
index adf60667134..d7dfb2bbd1c 100644
--- a/src/devices/bus/ti99x/genboard.cpp
+++ b/src/devices/bus/ti99x/genboard.cpp
@@ -1508,7 +1508,7 @@ void geneve_mapper_device::device_reset()
}
}
-const device_type GENEVE_MAPPER = &device_creator<geneve_mapper_device>;
+const device_type GENEVE_MAPPER = device_creator<geneve_mapper_device>;
/****************************************************************************
Keyboard support
@@ -2009,7 +2009,7 @@ ioport_constructor geneve_keyboard_device::device_input_ports() const
return INPUT_PORTS_NAME( genkeys );
}
-const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>;
+const device_type GENEVE_KEYBOARD = device_creator<geneve_keyboard_device>;
/****************************************************************************
Mouse support
@@ -2089,4 +2089,4 @@ ioport_constructor geneve_mouse_device::device_input_ports() const
return INPUT_PORTS_NAME( genmouse );
}
-const device_type GENEVE_MOUSE = &device_creator<geneve_mouse_device>;
+const device_type GENEVE_MOUSE = device_creator<geneve_mouse_device>;
diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp
index 1a9f95b1d85..fdf86ea60e0 100644
--- a/src/devices/bus/ti99x/gromport.cpp
+++ b/src/devices/bus/ti99x/gromport.cpp
@@ -278,7 +278,7 @@ ioport_constructor gromport_device::device_input_ports() const
return INPUT_PORTS_NAME(gromport);
}
-const device_type GROMPORT = &device_creator<gromport_device>;
+const device_type GROMPORT = device_creator<gromport_device>;
/***************************************************************************
Different versions of cartridge connections
@@ -291,9 +291,9 @@ const device_type GROMPORT = &device_creator<gromport_device>;
***************************************************************************/
-const device_type GROMPORT_SINGLE = &device_creator<single_conn_device>;
-const device_type GROMPORT_MULTI = &device_creator<multi_conn_device>;
-const device_type GROMPORT_GK = &device_creator<gkracker_device>;
+const device_type GROMPORT_SINGLE = device_creator<single_conn_device>;
+const device_type GROMPORT_MULTI = device_creator<multi_conn_device>;
+const device_type GROMPORT_GK = device_creator<gkracker_device>;
ti99_cartridge_connector_device::ti99_cartridge_connector_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)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
@@ -1565,7 +1565,7 @@ const tiny_rom_entry *ti99_cartridge_device::device_rom_region() const
return ROM_NAME( cartridge_memory );
}
-const device_type TI99CART = &device_creator<ti99_cartridge_device>;
+const device_type TI99CART = device_creator<ti99_cartridge_device>;
/***************************************************************************
Cartridge types
diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp
index 38e9b8261a6..8f9dd9aeb01 100644
--- a/src/devices/bus/ti99x/handset.cpp
+++ b/src/devices/bus/ti99x/handset.cpp
@@ -469,7 +469,7 @@ ioport_constructor ti99_handset_device::device_input_ports() const
return INPUT_PORTS_NAME( handset );
}
-const device_type HANDSET = &device_creator<ti99_handset_device>;
+const device_type HANDSET = device_creator<ti99_handset_device>;
/******************************************************************************
Twin Joystick
@@ -535,4 +535,4 @@ ioport_constructor ti99_twin_joystick::device_input_ports() const
return INPUT_PORTS_NAME( joysticks );
}
-const device_type TI99_JOYSTICK = &device_creator<ti99_twin_joystick>;
+const device_type TI99_JOYSTICK = device_creator<ti99_twin_joystick>;
diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp
index a098012ea21..ea7d3e18100 100644
--- a/src/devices/bus/ti99x/joyport.cpp
+++ b/src/devices/bus/ti99x/joyport.cpp
@@ -113,4 +113,4 @@ SLOT_INTERFACE_START( joystick_port_994 )
SLOT_INTERFACE("handset", HANDSET)
SLOT_INTERFACE_END
-const device_type JOYPORT = &device_creator<joyport_device>;
+const device_type JOYPORT = device_creator<joyport_device>;
diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp
index 207d89ef68b..b3c2c3d2c5d 100644
--- a/src/devices/bus/ti99x/mecmouse.cpp
+++ b/src/devices/bus/ti99x/mecmouse.cpp
@@ -216,4 +216,4 @@ ioport_constructor mecmouse_device::device_input_ports() const
return INPUT_PORTS_NAME( mecmouse );
}
-const device_type MECMOUSE = &device_creator<mecmouse_device>;
+const device_type MECMOUSE = device_creator<mecmouse_device>;
diff --git a/src/devices/bus/ti99x/ti99defs.cpp b/src/devices/bus/ti99x/ti99defs.cpp
new file mode 100644
index 00000000000..f65a95b8304
--- /dev/null
+++ b/src/devices/bus/ti99x/ti99defs.cpp
@@ -0,0 +1,17 @@
+// license:LGPL-2.1+
+// copyright-holders:Michael Zapf
+#include "emu.h"
+#include "ti99defs.h"
+
+const device_type EVPC_CONN = device_creator<evpc_clock_connector>;
+
+evpc_clock_connector::evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__)
+ , m_vdpint(*this)
+{
+}
+
+void evpc_clock_connector::device_start()
+{
+ m_vdpint.resolve();
+}
diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h
index 134b7cf0331..4957a50908f 100644
--- a/src/devices/bus/ti99x/ti99defs.h
+++ b/src/devices/bus/ti99x/ti99defs.h
@@ -153,16 +153,12 @@ public:
****************************************************************************/
class ti99_4x_state;
-class evpc_clock_connector;
-
-const device_type EVPC_CONN = &device_creator<evpc_clock_connector>;
+extern const device_type EVPC_CONN;
class evpc_clock_connector : public device_t
{
public:
- evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__),
- m_vdpint(*this) { };
+ evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &static_set_vdpint_callback(device_t &device, _Object object)
{
@@ -170,7 +166,7 @@ public:
}
WRITE_LINE_MEMBER( vclock_line ) { m_vdpint(state); }
- void device_start() override { m_vdpint.resolve(); }
+ void device_start() override;
private:
// VDPINT line to the CPU
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index 0a41728fbaf..45a0c116433 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TIKI100_8088 = &device_creator<tiki100_8088_t>;
+const device_type TIKI100_8088 = device_creator<tiki100_8088_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp
index 88d9b4d7f3b..95063b2d4cf 100644
--- a/src/devices/bus/tiki100/exp.cpp
+++ b/src/devices/bus/tiki100/exp.cpp
@@ -14,8 +14,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TIKI100_BUS = &device_creator<tiki100_bus_t>;
-const device_type TIKI100_BUS_SLOT = &device_creator<tiki100_bus_slot_t>;
+const device_type TIKI100_BUS = device_creator<tiki100_bus_t>;
+const device_type TIKI100_BUS_SLOT = device_creator<tiki100_bus_slot_t>;
diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp
index 32e43d621ba..a94856da571 100644
--- a/src/devices/bus/tiki100/hdc.cpp
+++ b/src/devices/bus/tiki100/hdc.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TIKI100_HDC = &device_creator<tiki100_hdc_t>;
+const device_type TIKI100_HDC = device_creator<tiki100_hdc_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp
index 017d67af1d6..1c19dd066ad 100644
--- a/src/devices/bus/tvc/hbf.cpp
+++ b/src/devices/bus/tvc/hbf.cpp
@@ -48,7 +48,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type TVC_HBF = &device_creator<tvc_hbf_device>;
+const device_type TVC_HBF = device_creator<tvc_hbf_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp
index 84f90f96af1..e726cffd99e 100644
--- a/src/devices/bus/tvc/tvc.cpp
+++ b/src/devices/bus/tvc/tvc.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type TVCEXP_SLOT = &device_creator<tvcexp_slot_device>;
+const device_type TVCEXP_SLOT = device_creator<tvcexp_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp
index 7ae6a408233..91d7e785ae7 100644
--- a/src/devices/bus/vboy/rom.cpp
+++ b/src/devices/bus/vboy/rom.cpp
@@ -17,8 +17,8 @@
// vboy_rom_device - constructor
//-------------------------------------------------
-const device_type VBOY_ROM_STD = &device_creator<vboy_rom_device>;
-const device_type VBOY_ROM_EEPROM = &device_creator<vboy_eeprom_device>;
+const device_type VBOY_ROM_STD = device_creator<vboy_rom_device>;
+const device_type VBOY_ROM_EEPROM = device_creator<vboy_eeprom_device>;
vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp
index 11be9933ebc..8eca2104261 100644
--- a/src/devices/bus/vboy/slot.cpp
+++ b/src/devices/bus/vboy/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VBOY_CART_SLOT = &device_creator<vboy_cart_slot_device>;
+const device_type VBOY_CART_SLOT = device_creator<vboy_cart_slot_device>;
//**************************************************************************
// vboy cartridges Interface
diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp
index ef5289abe0f..0f6f0865099 100644
--- a/src/devices/bus/vc4000/rom.cpp
+++ b/src/devices/bus/vc4000/rom.cpp
@@ -192,10 +192,10 @@
// vc4000_rom_device - constructor
//-------------------------------------------------
-const device_type VC4000_ROM_STD = &device_creator<vc4000_rom_device>;
-const device_type VC4000_ROM_ROM4K = &device_creator<vc4000_rom4k_device>;
-const device_type VC4000_ROM_RAM1K = &device_creator<vc4000_ram1k_device>;
-const device_type VC4000_ROM_CHESS2 = &device_creator<vc4000_chess2_device>;
+const device_type VC4000_ROM_STD = device_creator<vc4000_rom_device>;
+const device_type VC4000_ROM_ROM4K = device_creator<vc4000_rom4k_device>;
+const device_type VC4000_ROM_RAM1K = device_creator<vc4000_ram1k_device>;
+const device_type VC4000_ROM_CHESS2 = device_creator<vc4000_chess2_device>;
vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp
index 572645eff81..15d061772f0 100644
--- a/src/devices/bus/vc4000/slot.cpp
+++ b/src/devices/bus/vc4000/slot.cpp
@@ -15,8 +15,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VC4000_CART_SLOT = &device_creator<vc4000_cart_slot_device>;
-const device_type H21_CART_SLOT = &device_creator<h21_cart_slot_device>;
+const device_type VC4000_CART_SLOT = device_creator<vc4000_cart_slot_device>;
+const device_type H21_CART_SLOT = device_creator<h21_cart_slot_device>;
//**************************************************************************
// VC4000 Cartridges Interface
diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp
index b5e90744688..304dbbf3403 100644
--- a/src/devices/bus/vcs/compumat.cpp
+++ b/src/devices/bus/vcs/compumat.cpp
@@ -13,7 +13,7 @@
#include "emu.h"
#include "compumat.h"
-const device_type A26_ROM_COMPUMATE = &device_creator<a26_rom_cm_device>;
+const device_type A26_ROM_COMPUMATE = device_creator<a26_rom_cm_device>;
a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp
index 476f102456c..fe7da83d288 100644
--- a/src/devices/bus/vcs/dpc.cpp
+++ b/src/devices/bus/vcs/dpc.cpp
@@ -14,7 +14,7 @@
// DPC device
-const device_type ATARI_DPC = &device_creator<dpc_device>;
+const device_type ATARI_DPC = device_creator<dpc_device>;
dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
@@ -237,7 +237,7 @@ WRITE8_MEMBER(dpc_device::write)
// cart device
-const device_type A26_ROM_DPC = &device_creator<a26_rom_dpc_device>;
+const device_type A26_ROM_DPC = device_creator<a26_rom_dpc_device>;
a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index 0822db3d175..6721cb6eff9 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -63,7 +63,7 @@ map:
// cart device
-const device_type A26_ROM_HARMONY = &device_creator<a26_rom_harmony_device>;
+const device_type A26_ROM_HARMONY = device_creator<a26_rom_harmony_device>;
a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp
index 65ff0715fa8..be9be8ff7b7 100755
--- a/src/devices/bus/vcs/rom.cpp
+++ b/src/devices/bus/vcs/rom.cpp
@@ -21,27 +21,27 @@
// a26_rom_*k_device - constructor
//-------------------------------------------------
-const device_type A26_ROM_2K = &device_creator<a26_rom_2k_device>;
-const device_type A26_ROM_4K = &device_creator<a26_rom_4k_device>;
-const device_type A26_ROM_F4 = &device_creator<a26_rom_f4_device>;
-const device_type A26_ROM_F6 = &device_creator<a26_rom_f6_device>;
-const device_type A26_ROM_F8 = &device_creator<a26_rom_f8_device>;
-const device_type A26_ROM_F8_SW = &device_creator<a26_rom_f8_sw_device>;
-const device_type A26_ROM_FA = &device_creator<a26_rom_fa_device>;
-const device_type A26_ROM_FE = &device_creator<a26_rom_fe_device>;
-const device_type A26_ROM_3E = &device_creator<a26_rom_3e_device>;
-const device_type A26_ROM_3F = &device_creator<a26_rom_3f_device>;
-const device_type A26_ROM_E0 = &device_creator<a26_rom_e0_device>;
-const device_type A26_ROM_E7 = &device_creator<a26_rom_e7_device>;
-const device_type A26_ROM_UA = &device_creator<a26_rom_ua_device>;
-const device_type A26_ROM_CV = &device_creator<a26_rom_cv_device>;
-const device_type A26_ROM_DC = &device_creator<a26_rom_dc_device>;
-const device_type A26_ROM_FV = &device_creator<a26_rom_fv_device>;
-const device_type A26_ROM_JVP = &device_creator<a26_rom_jvp_device>;
-const device_type A26_ROM_4IN1 = &device_creator<a26_rom_4in1_device>;
-const device_type A26_ROM_8IN1 = &device_creator<a26_rom_8in1_device>;
-const device_type A26_ROM_32IN1 = &device_creator<a26_rom_32in1_device>;
-const device_type A26_ROM_X07 = &device_creator<a26_rom_x07_device>;
+const device_type A26_ROM_2K = device_creator<a26_rom_2k_device>;
+const device_type A26_ROM_4K = device_creator<a26_rom_4k_device>;
+const device_type A26_ROM_F4 = device_creator<a26_rom_f4_device>;
+const device_type A26_ROM_F6 = device_creator<a26_rom_f6_device>;
+const device_type A26_ROM_F8 = device_creator<a26_rom_f8_device>;
+const device_type A26_ROM_F8_SW = device_creator<a26_rom_f8_sw_device>;
+const device_type A26_ROM_FA = device_creator<a26_rom_fa_device>;
+const device_type A26_ROM_FE = device_creator<a26_rom_fe_device>;
+const device_type A26_ROM_3E = device_creator<a26_rom_3e_device>;
+const device_type A26_ROM_3F = device_creator<a26_rom_3f_device>;
+const device_type A26_ROM_E0 = device_creator<a26_rom_e0_device>;
+const device_type A26_ROM_E7 = device_creator<a26_rom_e7_device>;
+const device_type A26_ROM_UA = device_creator<a26_rom_ua_device>;
+const device_type A26_ROM_CV = device_creator<a26_rom_cv_device>;
+const device_type A26_ROM_DC = device_creator<a26_rom_dc_device>;
+const device_type A26_ROM_FV = device_creator<a26_rom_fv_device>;
+const device_type A26_ROM_JVP = device_creator<a26_rom_jvp_device>;
+const device_type A26_ROM_4IN1 = device_creator<a26_rom_4in1_device>;
+const device_type A26_ROM_8IN1 = device_creator<a26_rom_8in1_device>;
+const device_type A26_ROM_32IN1 = device_creator<a26_rom_32in1_device>;
+const device_type A26_ROM_X07 = device_creator<a26_rom_x07_device>;
a26_rom_2k_device::a26_rom_2k_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)
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index 49c27b2f311..44f03eb51fe 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -37,7 +37,7 @@
#include "sound/wave.h"
#include "formats/a26_cas.h"
-const device_type A26_ROM_SUPERCHARGER = &device_creator<a26_rom_ss_device>;
+const device_type A26_ROM_SUPERCHARGER = device_creator<a26_rom_ss_device>;
a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp
index 17efc8d8069..6099f9ee647 100644
--- a/src/devices/bus/vcs/vcs_slot.cpp
+++ b/src/devices/bus/vcs/vcs_slot.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VCS_CART_SLOT = &device_creator<vcs_cart_slot_device>;
+const device_type VCS_CART_SLOT = device_creator<vcs_cart_slot_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp
index 8e0c349ad23..f68088de7bf 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.cpp
+++ b/src/devices/bus/vcs_ctrl/ctrl.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITION
//**************************************************************************
-const device_type VCS_CONTROL_PORT = &device_creator<vcs_control_port_device>;
+const device_type VCS_CONTROL_PORT = device_creator<vcs_control_port_device>;
diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp
index 5a19874902a..8a731cc0ef1 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.cpp
+++ b/src/devices/bus/vcs_ctrl/joybooster.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_JOYSTICK_BOOSTER = &device_creator<vcs_joystick_booster_device>;
+const device_type VCS_JOYSTICK_BOOSTER = device_creator<vcs_joystick_booster_device>;
static INPUT_PORTS_START( vcs_joystick_booster )
diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp
index 333e632f98f..87ae2f72aa6 100644
--- a/src/devices/bus/vcs_ctrl/joystick.cpp
+++ b/src/devices/bus/vcs_ctrl/joystick.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_JOYSTICK = &device_creator<vcs_joystick_device>;
+const device_type VCS_JOYSTICK = device_creator<vcs_joystick_device>;
static INPUT_PORTS_START( vcs_joystick )
diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp
index 8054f40b4b8..7c8b0f0104a 100644
--- a/src/devices/bus/vcs_ctrl/keypad.cpp
+++ b/src/devices/bus/vcs_ctrl/keypad.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_KEYPAD = &device_creator<vcs_keypad_device>;
+const device_type VCS_KEYPAD = device_creator<vcs_keypad_device>;
static INPUT_PORTS_START( vcs_keypad )
diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp
index ab131678948..fe129a9fe5c 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.cpp
+++ b/src/devices/bus/vcs_ctrl/lightpen.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_LIGHTPEN = &device_creator<vcs_lightpen_device>;
+const device_type VCS_LIGHTPEN = device_creator<vcs_lightpen_device>;
INPUT_CHANGED_MEMBER( vcs_lightpen_device::trigger )
diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp
index d9eb99495ad..17ee8c854eb 100644
--- a/src/devices/bus/vcs_ctrl/paddles.cpp
+++ b/src/devices/bus/vcs_ctrl/paddles.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_PADDLES = &device_creator<vcs_paddles_device>;
+const device_type VCS_PADDLES = device_creator<vcs_paddles_device>;
static INPUT_PORTS_START( vcs_paddles )
diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp
index 2b0041123bc..2bff2cb5698 100644
--- a/src/devices/bus/vcs_ctrl/wheel.cpp
+++ b/src/devices/bus/vcs_ctrl/wheel.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VCS_WHEEL = &device_creator<vcs_wheel_device>;
+const device_type VCS_WHEEL = device_creator<vcs_wheel_device>;
static INPUT_PORTS_START( vcs_wheel )
diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp
index 44c4cd23c40..e4f53eb8e1d 100644
--- a/src/devices/bus/vectrex/rom.cpp
+++ b/src/devices/bus/vectrex/rom.cpp
@@ -20,9 +20,9 @@
// vectrex_rom_device - constructor
//-------------------------------------------------
-const device_type VECTREX_ROM_STD = &device_creator<vectrex_rom_device>;
-const device_type VECTREX_ROM_64K = &device_creator<vectrex_rom64k_device>;
-const device_type VECTREX_ROM_SRAM = &device_creator<vectrex_sram_device>;
+const device_type VECTREX_ROM_STD = device_creator<vectrex_rom_device>;
+const device_type VECTREX_ROM_64K = device_creator<vectrex_rom64k_device>;
+const device_type VECTREX_ROM_SRAM = device_creator<vectrex_sram_device>;
vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp
index 99ad846fd4c..a992b59c505 100644
--- a/src/devices/bus/vectrex/slot.cpp
+++ b/src/devices/bus/vectrex/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VECTREX_CART_SLOT = &device_creator<vectrex_cart_slot_device>;
+const device_type VECTREX_CART_SLOT = device_creator<vectrex_cart_slot_device>;
//**************************************************************************
// Vectrex Cartridges Interface
diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp
index cf8388d18e2..76f33da4721 100644
--- a/src/devices/bus/vic10/exp.cpp
+++ b/src/devices/bus/vic10/exp.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC10_EXPANSION_SLOT = &device_creator<vic10_expansion_slot_device>;
+const device_type VIC10_EXPANSION_SLOT = device_creator<vic10_expansion_slot_device>;
diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp
index 22b7eddd59e..28d9530494f 100644
--- a/src/devices/bus/vic10/std.cpp
+++ b/src/devices/bus/vic10/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC10_STD = &device_creator<vic10_standard_cartridge_device>;
+const device_type VIC10_STD = device_creator<vic10_standard_cartridge_device>;
diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp
index 2e7ebe550e9..ede850ed5be 100644
--- a/src/devices/bus/vic20/4cga.cpp
+++ b/src/devices/bus/vic20/4cga.cpp
@@ -18,7 +18,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64_4CGA = &device_creator<c64_4cga_device>;
+const device_type C64_4CGA = device_creator<c64_4cga_device>;
static INPUT_PORTS_START( c64_4player )
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index feacc8546c4..3757c2e0c92 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_EXPANSION_SLOT = &device_creator<vic20_expansion_slot_device>;
+const device_type VIC20_EXPANSION_SLOT = device_creator<vic20_expansion_slot_device>;
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 3c67cd15643..dbe03de0183 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -56,7 +56,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_FE3 = &device_creator<vic20_final_expansion_3_t>;
+const device_type VIC20_FE3 = device_creator<vic20_final_expansion_3_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index ce7edf6e3b7..7186e6b405c 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_MEGACART = &device_creator<vic20_megacart_device>;
+const device_type VIC20_MEGACART = device_creator<vic20_megacart_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp
index de443783f7d..102c18bae8f 100644
--- a/src/devices/bus/vic20/speakeasy.cpp
+++ b/src/devices/bus/vic20/speakeasy.cpp
@@ -10,6 +10,8 @@
#include "emu.h"
#include "speakeasy.h"
+#include "speaker.h"
+
//**************************************************************************
@@ -24,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_SPEAKEASY = &device_creator<vic20_speakeasy_t>;
+const device_type VIC20_SPEAKEASY = device_creator<vic20_speakeasy_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp
index 0eb21db38a1..26de8b6ef70 100644
--- a/src/devices/bus/vic20/std.cpp
+++ b/src/devices/bus/vic20/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_STD = &device_creator<vic20_standard_cartridge_device>;
+const device_type VIC20_STD = device_creator<vic20_standard_cartridge_device>;
diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index 1ef4711dab2..f2b2ec91219 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1010 = &device_creator<vic1010_device>;
+const device_type VIC1010 = device_creator<vic1010_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index b0792a09a48..5187fcdbf3a 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1011 = &device_creator<vic1011_device>;
+const device_type VIC1011 = device_creator<vic1011_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp
index cd384bbd143..0d9ec595347 100644
--- a/src/devices/bus/vic20/vic1110.cpp
+++ b/src/devices/bus/vic20/vic1110.cpp
@@ -28,7 +28,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1110 = &device_creator<vic1110_device>;
+const device_type VIC1110 = device_creator<vic1110_device>;
diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp
index bf26f2fe479..8d6b0268429 100644
--- a/src/devices/bus/vic20/vic1111.cpp
+++ b/src/devices/bus/vic20/vic1111.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1111 = &device_creator<vic1111_device>;
+const device_type VIC1111 = device_creator<vic1111_device>;
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 6006ecc0e21..070da86db75 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -24,7 +24,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1112 = &device_creator<vic1112_device>;
+const device_type VIC1112 = device_creator<vic1112_device>;
WRITE_LINE_MEMBER( vic1112_device::via0_irq_w )
diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp
index 039c5b25699..b28cb42aa78 100644
--- a/src/devices/bus/vic20/vic1210.cpp
+++ b/src/devices/bus/vic20/vic1210.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC1210 = &device_creator<vic1210_device>;
+const device_type VIC1210 = device_creator<vic1210_device>;
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index a11b9ba931c..c117263152e 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -10,6 +10,8 @@
#include "emu.h"
#include "videopak.h"
+#include "screen.h"
+
//**************************************************************************
@@ -28,7 +30,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIC20_VIDEO_PAK = &device_creator<vic20_video_pak_t>;
+const device_type VIC20_VIDEO_PAK = device_creator<vic20_video_pak_t>;
//-------------------------------------------------
diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp
index a91c6a6a88e..87d9e536ba3 100644
--- a/src/devices/bus/vidbrain/exp.cpp
+++ b/src/devices/bus/vidbrain/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIDEOBRAIN_EXPANSION_SLOT = &device_creator<videobrain_expansion_slot_device>;
+const device_type VIDEOBRAIN_EXPANSION_SLOT = device_creator<videobrain_expansion_slot_device>;
diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp
index 6a78467a5b9..eb7e7b2d6c4 100644
--- a/src/devices/bus/vidbrain/money_minder.cpp
+++ b/src/devices/bus/vidbrain/money_minder.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VB_MONEY_MINDER = &device_creator<videobrain_money_minder_cartridge_device>;
+const device_type VB_MONEY_MINDER = device_creator<videobrain_money_minder_cartridge_device>;
diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp
index de08b2c1d90..c8bbf1fbaae 100644
--- a/src/devices/bus/vidbrain/std.cpp
+++ b/src/devices/bus/vidbrain/std.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VB_STD = &device_creator<videobrain_standard_cartridge_device>;
+const device_type VB_STD = device_creator<videobrain_standard_cartridge_device>;
diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp
index 243e8618573..00b47a194a1 100644
--- a/src/devices/bus/vidbrain/timeshare.cpp
+++ b/src/devices/bus/vidbrain/timeshare.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VB_TIMESHARE = &device_creator<videobrain_timeshare_cartridge_device>;
+const device_type VB_TIMESHARE = device_creator<videobrain_timeshare_cartridge_device>;
diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp
index 387fcf96c0d..9e2cb2c7ef1 100644
--- a/src/devices/bus/vip/byteio.cpp
+++ b/src/devices/bus/vip/byteio.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VIP_BYTEIO_PORT = &device_creator<vip_byteio_port_device>;
+const device_type VIP_BYTEIO_PORT = device_creator<vip_byteio_port_device>;
diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp
index ca0ac0dca3f..f5dc4bdd070 100644
--- a/src/devices/bus/vip/exp.cpp
+++ b/src/devices/bus/vip/exp.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VIP_EXPANSION_SLOT = &device_creator<vip_expansion_slot_device>;
+const device_type VIP_EXPANSION_SLOT = device_creator<vip_expansion_slot_device>;
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index a0bd16b97d8..23e49972909 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -17,6 +17,8 @@
#include "emu.h"
#include "vp550.h"
+#include "speaker.h"
+
//**************************************************************************
@@ -41,7 +43,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP550 = &device_creator<vp550_device>;
+const device_type VP550 = device_creator<vp550_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp
index 10f944f69ff..0aaa2b7f256 100644
--- a/src/devices/bus/vip/vp570.cpp
+++ b/src/devices/bus/vip/vp570.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP570 = &device_creator<vp570_device>;
+const device_type VP570 = device_creator<vp570_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 8e28192f128..3c498a7ae83 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP575 = &device_creator<vp575_device>;
+const device_type VP575 = device_creator<vp575_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp
index 234ff8f0ea9..84f89fba5ef 100644
--- a/src/devices/bus/vip/vp585.cpp
+++ b/src/devices/bus/vip/vp585.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP585 = &device_creator<vp585_device>;
+const device_type VP585 = device_creator<vp585_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index b139a1456b2..3434c11fee7 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP590 = &device_creator<vp590_device>;
+const device_type VP590 = device_creator<vp590_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index 535c533b1d5..2c99188c79f 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "vp595.h"
+#include "speaker.h"
+
//**************************************************************************
@@ -24,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP595 = &device_creator<vp595_device>;
+const device_type VP595 = device_creator<vp595_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index 2eee62c326f..b90adb56425 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP620 = &device_creator<vp620_device>;
+const device_type VP620 = device_creator<vp620_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp
index 7c6080a6a7c..80e4085b458 100644
--- a/src/devices/bus/vip/vp700.cpp
+++ b/src/devices/bus/vip/vp700.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VP700 = &device_creator<vp700_device>;
+const device_type VP700 = device_creator<vp700_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp
index 96748316508..c4245ebc0a5 100644
--- a/src/devices/bus/vme/vme.cpp
+++ b/src/devices/bus/vme/vme.cpp
@@ -98,7 +98,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_SLOT = &device_creator<vme_slot_device>;
+const device_type VME_SLOT = device_creator<vme_slot_device>;
//-------------------------------------------------
// vme_slot_device - constructor
@@ -210,7 +210,7 @@ SLOT_INTERFACE_END
// VME device P1
//
-const device_type VME = &device_creator<vme_device>;
+const device_type VME = device_creator<vme_device>;
// static_set_cputag - used to be able to lookup the CPU owning this VME bus
void vme_device::static_set_cputag(device_t &device, const char *tag)
diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp
index aabd7184918..67eb8b033f6 100644
--- a/src/devices/bus/vme/vme_fccpu20.cpp
+++ b/src/devices/bus/vme/vme_fccpu20.cpp
@@ -213,13 +213,13 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_FCCPU20 = &device_creator<vme_fccpu20_card_device>;
-const device_type VME_FCCPU21S = &device_creator<vme_fccpu21s_card_device>;
-const device_type VME_FCCPU21 = &device_creator<vme_fccpu21_card_device>;
-const device_type VME_FCCPU21A = &device_creator<vme_fccpu21a_card_device>;
-const device_type VME_FCCPU21YA = &device_creator<vme_fccpu21ya_card_device>;
-const device_type VME_FCCPU21B = &device_creator<vme_fccpu21b_card_device>;
-const device_type VME_FCCPU21YB = &device_creator<vme_fccpu21yb_card_device>;
+const device_type VME_FCCPU20 = device_creator<vme_fccpu20_card_device>;
+const device_type VME_FCCPU21S = device_creator<vme_fccpu21s_card_device>;
+const device_type VME_FCCPU21 = device_creator<vme_fccpu21_card_device>;
+const device_type VME_FCCPU21A = device_creator<vme_fccpu21a_card_device>;
+const device_type VME_FCCPU21YA = device_creator<vme_fccpu21ya_card_device>;
+const device_type VME_FCCPU21B = device_creator<vme_fccpu21b_card_device>;
+const device_type VME_FCCPU21YB = device_creator<vme_fccpu21yb_card_device>;
#define CLOCK50 XTAL_50MHz /* HCJ */
#define CLOCK40 XTAL_40MHz /* HCJ */
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index 75d325f2c81..d6423822a25 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -161,7 +161,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_FCISIO1 = &device_creator<vme_fcisio1_card_device>;
+const device_type VME_FCISIO1 = device_creator<vme_fcisio1_card_device>;
#define CPU_CLOCK XTAL_20MHz /* HCJ */
#define DUSCC_CLOCK XTAL_14_7456MHz /* HCJ */
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 96e8548a86f..3d1be933dff 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -179,7 +179,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_FCSCSI1 = &device_creator<vme_fcscsi1_card_device>;
+const device_type VME_FCSCSI1 = device_creator<vme_fcscsi1_card_device>;
#define CPU_CRYSTAL XTAL_20MHz /* Jauch */
#define PIT_CRYSTAL XTAL_16MHz /* Jauch */
diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp
index b4caeb65ab9..d2fc6d07836 100644
--- a/src/devices/bus/vme/vme_mvme350.cpp
+++ b/src/devices/bus/vme/vme_mvme350.cpp
@@ -158,7 +158,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_MVME350 = &device_creator<vme_mvme350_card_device>;
+const device_type VME_MVME350 = device_creator<vme_mvme350_card_device>;
#define MVME350_CPU_TAG "mvme350_cpu"
#define MVME350_ROM "mvme350_rom"
diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp
index 9b3813ee488..24eac1dfc9d 100644
--- a/src/devices/bus/vme/vme_mzr8105.cpp
+++ b/src/devices/bus/vme/vme_mzr8105.cpp
@@ -30,7 +30,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_MZR8105 = &device_creator<vme_mzr8105_card_device>;
+const device_type VME_MZR8105 = device_creator<vme_mzr8105_card_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp
index 924b1844556..a9d85736661 100644
--- a/src/devices/bus/vme/vme_mzr8300.cpp
+++ b/src/devices/bus/vme/vme_mzr8300.cpp
@@ -113,7 +113,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VME_MZR8300 = &device_creator<vme_mzr8300_card_device>;
+const device_type VME_MZR8300 = device_creator<vme_mzr8300_card_device>;
/* These values are borrowed just to get the terminal going and should be replaced
* once a proper serial board hardware (ie MZ 8300) is found and emulated. */
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp
index 17796071922..178b35137ab 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.cpp
+++ b/src/devices/bus/vtech/ioexp/ioexp.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type IOEXP_SLOT = &device_creator<ioexp_slot_device>;
+const device_type IOEXP_SLOT = device_creator<ioexp_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp
index c2de69f455f..f73bf722be7 100644
--- a/src/devices/bus/vtech/ioexp/joystick.cpp
+++ b/src/devices/bus/vtech/ioexp/joystick.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type JOYSTICK_INTERFACE = &device_creator<joystick_interface_device>;
+const device_type JOYSTICK_INTERFACE = device_creator<joystick_interface_device>;
//-------------------------------------------------
// input_ports - device-specific input ports
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index dfc971bb914..974d8c3818c 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PRINTER_INTERFACE = &device_creator<printer_interface_device>;
+const device_type PRINTER_INTERFACE = device_creator<printer_interface_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp
index 0aca11479a0..355194df583 100644
--- a/src/devices/bus/vtech/memexp/floppy.cpp
+++ b/src/devices/bus/vtech/memexp/floppy.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type FLOPPY_CONTROLLER = &device_creator<floppy_controller_device>;
+const device_type FLOPPY_CONTROLLER = device_creator<floppy_controller_device>;
DEVICE_ADDRESS_MAP_START(map, 8, floppy_controller_device)
AM_RANGE(0, 0) AM_WRITE(latch_w)
diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp
index e568c3e5a02..369403aa1c4 100644
--- a/src/devices/bus/vtech/memexp/memexp.cpp
+++ b/src/devices/bus/vtech/memexp/memexp.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MEMEXP_SLOT = &device_creator<memexp_slot_device>;
+const device_type MEMEXP_SLOT = device_creator<memexp_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp
index db5e07a3348..96fc47bc52c 100644
--- a/src/devices/bus/vtech/memexp/memory.cpp
+++ b/src/devices/bus/vtech/memexp/memory.cpp
@@ -14,10 +14,10 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LASER110_16K = &device_creator<laser110_16k_device>;
-const device_type LASER210_16K = &device_creator<laser210_16k_device>;
-const device_type LASER310_16K = &device_creator<laser310_16k_device>;
-const device_type LASER_64K = &device_creator<laser_64k_device>;
+const device_type LASER110_16K = device_creator<laser110_16k_device>;
+const device_type LASER210_16K = device_creator<laser210_16k_device>;
+const device_type LASER310_16K = device_creator<laser310_16k_device>;
+const device_type LASER_64K = device_creator<laser_64k_device>;
//**************************************************************************
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index 7dc5c5a5362..550eb8f54b7 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type RS232_INTERFACE = &device_creator<rs232_interface_device>;
+const device_type RS232_INTERFACE = device_creator<rs232_interface_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp
index f96fc3e5ff3..d6a1278d577 100644
--- a/src/devices/bus/vtech/memexp/rtty.cpp
+++ b/src/devices/bus/vtech/memexp/rtty.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type RTTY_INTERFACE = &device_creator<rtty_interface_device>;
+const device_type RTTY_INTERFACE = device_creator<rtty_interface_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp
index d3a1de653c2..03df6982a61 100644
--- a/src/devices/bus/vtech/memexp/wordpro.cpp
+++ b/src/devices/bus/vtech/memexp/wordpro.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WORDPRO = &device_creator<wordpro_device>;
+const device_type WORDPRO = device_creator<wordpro_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp
index 0e71cd2e3db..06cb5372f9f 100644
--- a/src/devices/bus/wangpc/emb.cpp
+++ b/src/devices/bus/wangpc/emb.cpp
@@ -32,7 +32,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>;
+const device_type WANGPC_EMB = device_creator<wangpc_emb_device>;
diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp
index 72610644ffd..3bd7397001d 100644
--- a/src/devices/bus/wangpc/lic.cpp
+++ b/src/devices/bus/wangpc/lic.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_LIC = &device_creator<wangpc_lic_device>;
+const device_type WANGPC_LIC = device_creator<wangpc_lic_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index 0700e7ebc70..45c3ecf1834 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -19,6 +19,8 @@
#include "emu.h"
#include "lvc.h"
+#include "screen.h"
+
//**************************************************************************
@@ -45,7 +47,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_LVC = &device_creator<wangpc_lvc_device>;
+const device_type WANGPC_LVC = device_creator<wangpc_lvc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp
index 816c2921431..93fe1f530a3 100644
--- a/src/devices/bus/wangpc/mcc.cpp
+++ b/src/devices/bus/wangpc/mcc.cpp
@@ -48,7 +48,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_MCC = &device_creator<wangpc_mcc_device>;
+const device_type WANGPC_MCC = device_creator<wangpc_mcc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index a76af5b62d4..af95b0695ac 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -18,6 +18,8 @@
#include "emu.h"
#include "mvc.h"
+#include "screen.h"
+
//**************************************************************************
@@ -60,7 +62,7 @@ static const rgb_t PALETTE_MVC[] =
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_MVC = &device_creator<wangpc_mvc_device>;
+const device_type WANGPC_MVC = device_creator<wangpc_mvc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index 925c15d67d7..1e59c870b68 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_RTC = &device_creator<wangpc_rtc_device>;
+const device_type WANGPC_RTC = device_creator<wangpc_rtc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index a672a1b8f84..31dea52508c 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -17,6 +17,8 @@
#include "emu.h"
#include "tig.h"
+#include "screen.h"
+
//**************************************************************************
@@ -53,7 +55,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_TIG = &device_creator<wangpc_tig_device>;
+const device_type WANGPC_TIG = device_creator<wangpc_tig_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp
index 87801b57823..7d387ecec15 100644
--- a/src/devices/bus/wangpc/wangpc.cpp
+++ b/src/devices/bus/wangpc/wangpc.cpp
@@ -14,8 +14,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_BUS = &device_creator<wangpcbus_device>;
-const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>;
+const device_type WANGPC_BUS = device_creator<wangpcbus_device>;
+const device_type WANGPC_BUS_SLOT = device_creator<wangpcbus_slot_device>;
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index 43d70269fea..4c6326c85d3 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_WDC = &device_creator<wangpc_wdc_device>;
+const device_type WANGPC_WDC = device_creator<wangpc_wdc_device>;
//-------------------------------------------------
diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp
index e95585dd08f..b9594f84ac1 100644
--- a/src/devices/bus/wswan/rom.cpp
+++ b/src/devices/bus/wswan/rom.cpp
@@ -21,9 +21,9 @@ enum
// ws_rom_device - constructor
//-------------------------------------------------
-const device_type WS_ROM_STD = &device_creator<ws_rom_device>;
-const device_type WS_ROM_SRAM = &device_creator<ws_rom_sram_device>;
-const device_type WS_ROM_EEPROM = &device_creator<ws_rom_eeprom_device>;
+const device_type WS_ROM_STD = device_creator<ws_rom_device>;
+const device_type WS_ROM_SRAM = device_creator<ws_rom_sram_device>;
+const device_type WS_ROM_EEPROM = device_creator<ws_rom_eeprom_device>;
ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp
index 0472cfa2ad5..b5d35b92e9f 100644
--- a/src/devices/bus/wswan/slot.cpp
+++ b/src/devices/bus/wswan/slot.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type WS_CART_SLOT = &device_creator<ws_cart_slot_device>;
+const device_type WS_CART_SLOT = device_creator<ws_cart_slot_device>;
//**************************************************************************
// Wonderswan Cartridges Interface
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index e8e2c8b8199..eb58464d92f 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -13,7 +13,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type X68K_NEPTUNEX = &device_creator<x68k_neptune_device>;
+const device_type X68K_NEPTUNEX = device_creator<x68k_neptune_device>;
// device machine config
static MACHINE_CONFIG_FRAGMENT( x68k_neptunex )
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index 2036fb414e4..049a990ff1f 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -18,7 +18,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type X68K_SCSIEXT = &device_creator<x68k_scsiext_device>;
+const device_type X68K_SCSIEXT = device_creator<x68k_scsiext_device>;
//-------------------------------------------------
// rom_region - device-specific ROM region
diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp
index 94484ac3ea1..c187ad0a26d 100644
--- a/src/devices/bus/x68k/x68kexp.cpp
+++ b/src/devices/bus/x68k/x68kexp.cpp
@@ -11,7 +11,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type X68K_EXPANSION_SLOT = &device_creator<x68k_expansion_slot_device>;
+const device_type X68K_EXPANSION_SLOT = device_creator<x68k_expansion_slot_device>;
//**************************************************************************
diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp
index ea6337a9c2f..752ec937eb9 100644
--- a/src/devices/bus/z88/flash.cpp
+++ b/src/devices/bus/z88/flash.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type Z88_1024K_FLASH = &device_creator<z88_1024k_flash_device>;
+const device_type Z88_1024K_FLASH = device_creator<z88_1024k_flash_device>;
//-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( z88_flash )
diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp
index 08f70d46b16..22852bf62b3 100644
--- a/src/devices/bus/z88/ram.cpp
+++ b/src/devices/bus/z88/ram.cpp
@@ -19,10 +19,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type Z88_32K_RAM = &device_creator<z88_32k_ram_device>;
-const device_type Z88_128K_RAM = &device_creator<z88_128k_ram_device>;
-const device_type Z88_512K_RAM = &device_creator<z88_512k_ram_device>;
-const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>;
+const device_type Z88_32K_RAM = device_creator<z88_32k_ram_device>;
+const device_type Z88_128K_RAM = device_creator<z88_128k_ram_device>;
+const device_type Z88_512K_RAM = device_creator<z88_512k_ram_device>;
+const device_type Z88_1024K_RAM = device_creator<z88_1024k_ram_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp
index 6ec8fb0b773..4ac53bba045 100644
--- a/src/devices/bus/z88/rom.cpp
+++ b/src/devices/bus/z88/rom.cpp
@@ -19,9 +19,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type Z88_32K_ROM = &device_creator<z88_32k_rom_device>;
-const device_type Z88_128K_ROM = &device_creator<z88_128k_rom_device>;
-const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>;
+const device_type Z88_32K_ROM = device_creator<z88_32k_rom_device>;
+const device_type Z88_128K_ROM = device_creator<z88_128k_rom_device>;
+const device_type Z88_256K_ROM = device_creator<z88_256k_rom_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp
index c9965987a92..8148772ad51 100644
--- a/src/devices/bus/z88/z88.cpp
+++ b/src/devices/bus/z88/z88.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type Z88CART_SLOT = &device_creator<z88cart_slot_device>;
+const device_type Z88CART_SLOT = device_creator<z88cart_slot_device>;
//**************************************************************************
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index 8d17550efa0..a405d4dda69 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -37,7 +37,7 @@
#define DST_LATCH do { if(DST_IS_RIGHT_BANK) m_right_IV = READPORT(m_IVR+0x100); else m_left_IV = READPORT(m_IVL); } while (0)
#define SET_OVF do { if(result & 0xff00) m_OVF = 1; else m_OVF = 0; } while (0)
-const device_type N8X300 = &device_creator<n8x300_cpu_device>;
+const device_type N8X300 = device_creator<n8x300_cpu_device>;
n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp
index edd7cbd9cd3..88670a0bf5e 100644
--- a/src/devices/cpu/adsp2100/adsp2100.cpp
+++ b/src/devices/cpu/adsp2100/adsp2100.cpp
@@ -103,12 +103,12 @@
// device type definitions
-const device_type ADSP2100 = &device_creator<adsp2100_device>;
-const device_type ADSP2101 = &device_creator<adsp2101_device>;
-const device_type ADSP2104 = &device_creator<adsp2104_device>;
-const device_type ADSP2105 = &device_creator<adsp2105_device>;
-const device_type ADSP2115 = &device_creator<adsp2115_device>;
-const device_type ADSP2181 = &device_creator<adsp2181_device>;
+const device_type ADSP2100 = device_creator<adsp2100_device>;
+const device_type ADSP2101 = device_creator<adsp2101_device>;
+const device_type ADSP2104 = device_creator<adsp2104_device>;
+const device_type ADSP2105 = device_creator<adsp2105_device>;
+const device_type ADSP2115 = device_creator<adsp2115_device>;
+const device_type ADSP2181 = device_creator<adsp2181_device>;
//**************************************************************************
diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp
index e06b05f39a2..81ac62696b7 100644
--- a/src/devices/cpu/alph8201/alph8201.cpp
+++ b/src/devices/cpu/alph8201/alph8201.cpp
@@ -165,8 +165,8 @@ Timming
#include "alph8201.h"
-const device_type ALPHA8201L = &device_creator<alpha8201_cpu_device>;
-const device_type ALPHA8301L = &device_creator<alpha8301_cpu_device>;
+const device_type ALPHA8201L = device_creator<alpha8201_cpu_device>;
+const device_type ALPHA8301L = device_creator<alpha8301_cpu_device>;
/* instruction cycle count */
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index ad88171abd2..56b2e89ebb3 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ALTO2 = &device_creator<alto2_cpu_device>;
+const device_type ALTO2 = device_creator<alto2_cpu_device>;
//**************************************************************************
// LOGGING AND DEBUGGING
diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
index 56133711001..58dbefd0984 100644
--- a/src/devices/cpu/alto2/alto2cpu.h
+++ b/src/devices/cpu/alto2/alto2cpu.h
@@ -5,14 +5,15 @@
* Xerox AltoII CPU core interface
*
*****************************************************************************/
-#ifndef _CPU_ALTO2_H_
-#define _CPU_ALTO2_H_
+#ifndef MAME_DEVICES_CPU_ALTO2_H
+#define MAME_DEVICES_CPU_ALTO2_H
-#define ALTO2_TAG "alto2"
+#include "machine/diablo_hd.h"
+#include "sound/spkrdev.h"
#include "debugger.h"
-#include "sound/speaker.h"
-#include "machine/diablo_hd.h"
+
+#define ALTO2_TAG "alto2"
/**
* \brief AltoII register names
@@ -938,5 +939,4 @@ private:
extern const device_type ALTO2;
-
-#endif /* _CPU_ALTO2_H_ */
+#endif // MAME_DEVICES_CPU_ALTO2_H
diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp
index fbc5a231ac3..8960629ea9e 100644
--- a/src/devices/cpu/am29000/am29000.cpp
+++ b/src/devices/cpu/am29000/am29000.cpp
@@ -19,7 +19,7 @@
#include "am29000.h"
-const device_type AM29000 = &device_creator<am29000_cpu_device>;
+const device_type AM29000 = device_creator<am29000_cpu_device>;
/***************************************************************************
diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp
index 0dde5fed2ee..5d1436d2fe6 100644
--- a/src/devices/cpu/amis2000/amis2000.cpp
+++ b/src/devices/cpu/amis2000/amis2000.cpp
@@ -26,11 +26,11 @@
// S2000 is the most basic one, 64 nibbles internal RAM and 1KB internal ROM
// S2150 increased RAM to 80 nibbles and ROM to 1.5KB
// high-voltage output versions of these chips (S2000A and S2150A) are identical overall
-const device_type AMI_S2000 = &device_creator<amis2000_cpu_device>;
-const device_type AMI_S2150 = &device_creator<amis2150_cpu_device>;
+const device_type AMI_S2000 = device_creator<amis2000_cpu_device>;
+const device_type AMI_S2150 = device_creator<amis2150_cpu_device>;
// S2152 is an extension to S2150, removing the K pins and adding a better timer
-const device_type AMI_S2152 = &device_creator<amis2152_cpu_device>;
+const device_type AMI_S2152 = device_creator<amis2152_cpu_device>;
// internal memory maps
diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp
index c15f1210002..46ead8310c1 100644
--- a/src/devices/cpu/apexc/apexc.cpp
+++ b/src/devices/cpu/apexc/apexc.cpp
@@ -330,7 +330,7 @@ field: X address D Function Y address D (part 2)
#include "apexc.h"
-const device_type APEXC = &device_creator<apexc_cpu_device>;
+const device_type APEXC = device_creator<apexc_cpu_device>;
/* decrement ICount by n */
diff --git a/src/devices/cpu/arc/arc.cpp b/src/devices/cpu/arc/arc.cpp
index 71c55b674a2..c1ebd6f2eff 100644
--- a/src/devices/cpu/arc/arc.cpp
+++ b/src/devices/cpu/arc/arc.cpp
@@ -14,7 +14,7 @@
#include "arc.h"
-const device_type ARC = &device_creator<arc_device>;
+const device_type ARC = device_creator<arc_device>;
arc_device::arc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp
index cd44d6b5681..d4fdf778088 100644
--- a/src/devices/cpu/arcompact/arcompact.cpp
+++ b/src/devices/cpu/arcompact/arcompact.cpp
@@ -24,7 +24,7 @@
#include "arcompact_common.h"
-const device_type ARCA5 = &device_creator<arcompact_device>;
+const device_type ARCA5 = device_creator<arcompact_device>;
READ32_MEMBER( arcompact_device::arcompact_auxreg002_LPSTART_r) { return m_LP_START&0xfffffffe; }
diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp
index 884b22896cd..84dde513827 100644
--- a/src/devices/cpu/arm/arm.cpp
+++ b/src/devices/cpu/arm/arm.cpp
@@ -224,8 +224,8 @@ enum
/***************************************************************************/
-const device_type ARM = &device_creator<arm_cpu_device>;
-const device_type ARM_BE = &device_creator<arm_be_cpu_device>;
+const device_type ARM = device_creator<arm_cpu_device>;
+const device_type ARM_BE = device_creator<arm_be_cpu_device>;
arm_cpu_device::arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
index 52e148a92ac..4933ea18b52 100644
--- a/src/devices/cpu/arm7/arm7.cpp
+++ b/src/devices/cpu/arm7/arm7.cpp
@@ -45,13 +45,13 @@ void (*arm7_coproc_dt_r_callback)(arm_state *arm, uint32_t insn, uint32_t *prn,
void (*arm7_coproc_dt_w_callback)(arm_state *arm, uint32_t insn, uint32_t *prn, void (*write32)(arm_state *arm, uint32_t addr, uint32_t data));
-const device_type ARM7 = &device_creator<arm7_cpu_device>;
-const device_type ARM7_BE = &device_creator<arm7_be_cpu_device>;
-const device_type ARM7500 = &device_creator<arm7500_cpu_device>;
-const device_type ARM9 = &device_creator<arm9_cpu_device>;
-const device_type ARM920T = &device_creator<arm920t_cpu_device>;
-const device_type PXA255 = &device_creator<pxa255_cpu_device>;
-const device_type SA1110 = &device_creator<sa1110_cpu_device>;
+const device_type ARM7 = device_creator<arm7_cpu_device>;
+const device_type ARM7_BE = device_creator<arm7_be_cpu_device>;
+const device_type ARM7500 = device_creator<arm7500_cpu_device>;
+const device_type ARM9 = device_creator<arm9_cpu_device>;
+const device_type ARM920T = device_creator<arm920t_cpu_device>;
+const device_type PXA255 = device_creator<pxa255_cpu_device>;
+const device_type SA1110 = device_creator<sa1110_cpu_device>;
arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index 57b917ab235..d9b21e9d5c1 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -15,7 +15,7 @@
#include "emu.h"
#include "lpc210x.h"
-const device_type LPC2103 = &device_creator<lpc210x_device>;
+const device_type LPC2103 = device_creator<lpc210x_device>;
static ADDRESS_MAP_START( lpc2103_map, AS_PROGRAM, 32, lpc210x_device )
AM_RANGE(0x00000000, 0x00007fff) AM_READWRITE(flash_r, flash_w) // 32kb internal FLASH rom
diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp
index 6e539784ab1..ccf461162d1 100644
--- a/src/devices/cpu/asap/asap.cpp
+++ b/src/devices/cpu/asap/asap.cpp
@@ -130,7 +130,7 @@ const asap_device::ophandler asap_device::s_conditiontable[16] =
//**************************************************************************
// device type definition
-const device_type ASAP = &device_creator<asap_device>;
+const device_type ASAP = device_creator<asap_device>;
//-------------------------------------------------
// asap_device - constructor
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index 7ae680fd3b5..a79ae1d06a7 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -567,10 +567,10 @@ enum
// DEVICE INTERFACE
//**************************************************************************
-const device_type ATMEGA88 = &device_creator<atmega88_device>;
-const device_type ATMEGA644 = &device_creator<atmega644_device>;
-const device_type ATMEGA1280 = &device_creator<atmega1280_device>;
-const device_type ATMEGA2560 = &device_creator<atmega2560_device>;
+const device_type ATMEGA88 = device_creator<atmega88_device>;
+const device_type ATMEGA644 = device_creator<atmega644_device>;
+const device_type ATMEGA1280 = device_creator<atmega1280_device>;
+const device_type ATMEGA2560 = device_creator<atmega2560_device>;
//**************************************************************************
// INTERNAL ADDRESS MAP
diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp
index ad9fbedca86..a7742e9b270 100644
--- a/src/devices/cpu/ccpu/ccpu.cpp
+++ b/src/devices/cpu/ccpu/ccpu.cpp
@@ -15,7 +15,7 @@
#include "ccpu.h"
-const device_type CCPU = &device_creator<ccpu_cpu_device>;
+const device_type CCPU = device_creator<ccpu_cpu_device>;
/***************************************************************************
diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp
index e60cad16d71..86093bb4e88 100644
--- a/src/devices/cpu/clipper/clipper.cpp
+++ b/src/devices/cpu/clipper/clipper.cpp
@@ -28,9 +28,9 @@
#define LOG_INTERRUPT(...)
#endif
-const device_type CLIPPER_C100 = &device_creator<clipper_c100_device>;
-const device_type CLIPPER_C300 = &device_creator<clipper_c300_device>;
-const device_type CLIPPER_C400 = &device_creator<clipper_c400_device>;
+const device_type CLIPPER_C100 = device_creator<clipper_c100_device>;
+const device_type CLIPPER_C300 = device_creator<clipper_c300_device>;
+const device_type CLIPPER_C400 = device_creator<clipper_c400_device>;
clipper_c100_device::clipper_c100_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: clipper_device(mconfig, CLIPPER_C100, "C100 CLIPPER", tag, owner, clock, "C100", __FILE__) { }
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index 28394aa88f8..757cf0cf21f 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -58,23 +58,23 @@
#include "cop400.h"
-const device_type COP401 = &device_creator<cop401_cpu_device>;
-const device_type COP410 = &device_creator<cop410_cpu_device>;
-const device_type COP411 = &device_creator<cop411_cpu_device>;
-const device_type COP402 = &device_creator<cop402_cpu_device>;
-const device_type COP420 = &device_creator<cop420_cpu_device>;
-const device_type COP421 = &device_creator<cop421_cpu_device>;
-const device_type COP422 = &device_creator<cop422_cpu_device>;
-const device_type COP404L = &device_creator<cop404l_cpu_device>;
-const device_type COP444L = &device_creator<cop444l_cpu_device>;
-const device_type COP445L = &device_creator<cop445l_cpu_device>;
-const device_type COP404C = &device_creator<cop404c_cpu_device>;
-const device_type COP424C = &device_creator<cop424c_cpu_device>;
-const device_type COP425C = &device_creator<cop425c_cpu_device>;
-const device_type COP426C = &device_creator<cop426c_cpu_device>;
-const device_type COP444C = &device_creator<cop444c_cpu_device>;
-const device_type COP445C = &device_creator<cop445c_cpu_device>;
-const device_type COP446C = &device_creator<cop446c_cpu_device>;
+const device_type COP401 = device_creator<cop401_cpu_device>;
+const device_type COP410 = device_creator<cop410_cpu_device>;
+const device_type COP411 = device_creator<cop411_cpu_device>;
+const device_type COP402 = device_creator<cop402_cpu_device>;
+const device_type COP420 = device_creator<cop420_cpu_device>;
+const device_type COP421 = device_creator<cop421_cpu_device>;
+const device_type COP422 = device_creator<cop422_cpu_device>;
+const device_type COP404L = device_creator<cop404l_cpu_device>;
+const device_type COP444L = device_creator<cop444l_cpu_device>;
+const device_type COP445L = device_creator<cop445l_cpu_device>;
+const device_type COP404C = device_creator<cop404c_cpu_device>;
+const device_type COP424C = device_creator<cop424c_cpu_device>;
+const device_type COP425C = device_creator<cop425c_cpu_device>;
+const device_type COP426C = device_creator<cop426c_cpu_device>;
+const device_type COP444C = device_creator<cop444c_cpu_device>;
+const device_type COP445C = device_creator<cop445c_cpu_device>;
+const device_type COP446C = device_creator<cop446c_cpu_device>;
diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp
index 0e8c3de3f3c..913b71cbd31 100644
--- a/src/devices/cpu/cosmac/cosmac.cpp
+++ b/src/devices/cpu/cosmac/cosmac.cpp
@@ -260,8 +260,8 @@ cosmac_device::ophandler cdp1802_device::get_ophandler(uint8_t opcode)
//**************************************************************************
// device type definition
-const device_type CDP1801 = &device_creator<cdp1801_device>;
-const device_type CDP1802 = &device_creator<cdp1802_device>;
+const device_type CDP1801 = device_creator<cdp1801_device>;
+const device_type CDP1802 = device_creator<cdp1802_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp
index b2b923fbc8f..60ba26c1e36 100644
--- a/src/devices/cpu/cp1610/cp1610.cpp
+++ b/src/devices/cpu/cp1610/cp1610.cpp
@@ -18,7 +18,7 @@
#include "cp1610.h"
-const device_type CP1610 = &device_creator<cp1610_cpu_device>;
+const device_type CP1610 = device_creator<cp1610_cpu_device>;
#define S 0x80
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
index a2216a1025a..0ddb88e974d 100644
--- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
+++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
@@ -70,9 +70,9 @@ enum alu_dst
***************************************************************************/
-const device_type CQUESTSND = &device_creator<cquestsnd_cpu_device>;
-const device_type CQUESTROT = &device_creator<cquestrot_cpu_device>;
-const device_type CQUESTLIN = &device_creator<cquestlin_cpu_device>;
+const device_type CQUESTSND = device_creator<cquestsnd_cpu_device>;
+const device_type CQUESTROT = device_creator<cquestrot_cpu_device>;
+const device_type CQUESTLIN = device_creator<cquestlin_cpu_device>;
cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index 6baaa215e73..e9b6444b162 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -27,7 +27,7 @@
//**************************************************************************
// device type definition
-const device_type DSP16 = &device_creator<dsp16_device>;
+const device_type DSP16 = device_creator<dsp16_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp
index ca4a757ee41..18a50dc0b26 100644
--- a/src/devices/cpu/dsp32/dsp32.cpp
+++ b/src/devices/cpu/dsp32/dsp32.cpp
@@ -136,7 +136,7 @@
// DEVICE INTERFACE
//**************************************************************************
-const device_type DSP32C = &device_creator<dsp32c_device>;
+const device_type DSP32C = device_creator<dsp32c_device>;
//-------------------------------------------------
// dsp32c_device - constructor
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index 47d090c6ec0..f75d720c2f7 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -102,7 +102,7 @@ enum
};
-const device_type DSP56156 = &device_creator<dsp56k_device>;
+const device_type DSP56156 = device_creator<dsp56k_device>;
/****************************************************************************
diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp
index bc82ebd5c25..36e3ded51fa 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.cpp
+++ b/src/devices/cpu/e0c6200/e0c6s46.cpp
@@ -28,7 +28,7 @@ enum
IRQREG_INPUT1
};
-const device_type E0C6S46 = &device_creator<e0c6s46_device>;
+const device_type E0C6S46 = device_creator<e0c6s46_device>;
// internal memory maps
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index 7e3c0b54665..f59b522a365 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -4964,17 +4964,17 @@ void hyperstone_device::execute_run()
} while( m_icount > 0 );
}
-const device_type E116T = &device_creator<e116t_device>;
-const device_type E116XT = &device_creator<e116xt_device>;
-const device_type E116XS = &device_creator<e116xs_device>;
-const device_type E116XSR = &device_creator<e116xsr_device>;
-const device_type E132N = &device_creator<e132n_device>;
-const device_type E132T = &device_creator<e132t_device>;
-const device_type E132XN = &device_creator<e132xn_device>;
-const device_type E132XT = &device_creator<e132xt_device>;
-const device_type E132XS = &device_creator<e132xs_device>;
-const device_type E132XSR = &device_creator<e132xsr_device>;
-const device_type GMS30C2116 = &device_creator<gms30c2116_device>;
-const device_type GMS30C2132 = &device_creator<gms30c2132_device>;
-const device_type GMS30C2216 = &device_creator<gms30c2216_device>;
-const device_type GMS30C2232 = &device_creator<gms30c2232_device>;
+const device_type E116T = device_creator<e116t_device>;
+const device_type E116XT = device_creator<e116xt_device>;
+const device_type E116XS = device_creator<e116xs_device>;
+const device_type E116XSR = device_creator<e116xsr_device>;
+const device_type E132N = device_creator<e132n_device>;
+const device_type E132T = device_creator<e132t_device>;
+const device_type E132XN = device_creator<e132xn_device>;
+const device_type E132XT = device_creator<e132xt_device>;
+const device_type E132XS = device_creator<e132xs_device>;
+const device_type E132XSR = device_creator<e132xsr_device>;
+const device_type GMS30C2116 = device_creator<gms30c2116_device>;
+const device_type GMS30C2132 = device_creator<gms30c2132_device>;
+const device_type GMS30C2216 = device_creator<gms30c2216_device>;
+const device_type GMS30C2232 = device_creator<gms30c2232_device>;
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index 8113c5c3bd9..43cf3ecb702 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -54,7 +54,7 @@ static int exec_cc = 0;
#define LOG_EXEC(x)
#endif
-const device_type ES5510 = &device_creator<es5510_device>;
+const device_type ES5510 = device_creator<es5510_device>;
#define FLAG_N (1 << 7)
#define FLAG_C (1 << 6)
diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp
index f59f4d46bdf..2780a3a50e3 100644
--- a/src/devices/cpu/esrip/esrip.cpp
+++ b/src/devices/cpu/esrip/esrip.cpp
@@ -10,9 +10,11 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "esrip.h"
+#include "debugger.h"
+#include "screen.h"
+
/***************************************************************************
CONSTANTS
@@ -1685,7 +1687,7 @@ void esrip_device::nop(uint16_t inst)
// DEVICE INTERFACE
//**************************************************************************
-const device_type ESRIP = &device_creator<esrip_device>;
+const device_type ESRIP = device_creator<esrip_device>;
//-------------------------------------------------
// esrip_device - constructor
diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp
index 2c49b8969b8..8df6d500366 100644
--- a/src/devices/cpu/f8/f8.cpp
+++ b/src/devices/cpu/f8/f8.cpp
@@ -56,7 +56,7 @@
}
-const device_type F8 = &device_creator<f8_cpu_device>;
+const device_type F8 = device_creator<f8_cpu_device>;
f8_cpu_device::f8_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp
index 9f2689b93f9..7e0548e7c0d 100644
--- a/src/devices/cpu/g65816/g65816.cpp
+++ b/src/devices/cpu/g65816/g65816.cpp
@@ -93,8 +93,8 @@ TODO general:
#include "g65816.h"
-const device_type G65816 = &device_creator<g65816_device>;
-const device_type _5A22 = &device_creator<_5a22_device>;
+const device_type G65816 = device_creator<g65816_device>;
+const device_type _5A22 = device_creator<_5a22_device>;
g65816_device::g65816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index 8a4c7aa7bca..87a3f2c8dd1 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -153,7 +153,7 @@ enum
// DEVICE INTERFACE
//**************************************************************************
-const device_type H6280 = &device_creator<h6280_device>;
+const device_type H6280 = device_creator<h6280_device>;
//-------------------------------------------------
// h6280_device - constructor
diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp
index da976c31052..cc2ca77860e 100644
--- a/src/devices/cpu/h8/h83002.cpp
+++ b/src/devices/cpu/h8/h83002.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h83002.h"
-const device_type H83002 = &device_creator<h83002_device>;
+const device_type H83002 = device_creator<h83002_device>;
h83002_device::h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
h8h_device(mconfig, H83002, "H8/3002", tag, owner, clock, "h83002", __FILE__, address_map_delegate(FUNC(h83002_device::map), this)),
diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp
index fd0ed7cc9dc..1c12b4b8a89 100644
--- a/src/devices/cpu/h8/h83006.cpp
+++ b/src/devices/cpu/h8/h83006.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "h83006.h"
-const device_type H83006 = &device_creator<h83006_device>;
-const device_type H83007 = &device_creator<h83007_device>;
+const device_type H83006 = device_creator<h83006_device>;
+const device_type H83007 = device_creator<h83007_device>;
h83006_device::h83006_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) :
diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp
index c6462944420..05fd4df2482 100644
--- a/src/devices/cpu/h8/h83008.cpp
+++ b/src/devices/cpu/h8/h83008.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h83008.h"
-const device_type H83008 = &device_creator<h83008_device>;
+const device_type H83008 = device_creator<h83008_device>;
h83008_device::h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
h8h_device(mconfig, H83008, "H8/3008", tag, owner, clock, "h83008", __FILE__, address_map_delegate(FUNC(h83008_device::map), this)),
diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp
index 0689072e9aa..f68b52b382c 100644
--- a/src/devices/cpu/h8/h83048.cpp
+++ b/src/devices/cpu/h8/h83048.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "h83048.h"
-const device_type H83044 = &device_creator<h83044_device>;
-const device_type H83045 = &device_creator<h83045_device>;
-const device_type H83047 = &device_creator<h83047_device>;
-const device_type H83048 = &device_creator<h83048_device>;
+const device_type H83044 = device_creator<h83044_device>;
+const device_type H83045 = device_creator<h83045_device>;
+const device_type H83047 = device_creator<h83047_device>;
+const device_type H83048 = device_creator<h83048_device>;
h83048_device::h83048_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) :
h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83048_device::map), this)),
diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp
index 8f1eeb57451..eb107c504dc 100644
--- a/src/devices/cpu/h8/h83337.cpp
+++ b/src/devices/cpu/h8/h83337.cpp
@@ -3,9 +3,9 @@
#include "emu.h"
#include "h83337.h"
-const device_type H83334 = &device_creator<h83334_device>;
-const device_type H83336 = &device_creator<h83336_device>;
-const device_type H83337 = &device_creator<h83337_device>;
+const device_type H83334 = device_creator<h83334_device>;
+const device_type H83336 = device_creator<h83336_device>;
+const device_type H83337 = device_creator<h83337_device>;
h83337_device::h83337_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) :
diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp
index 7a153253e10..fbeaa5e9199 100644
--- a/src/devices/cpu/h8/h8_adc.cpp
+++ b/src/devices/cpu/h8/h8_adc.cpp
@@ -8,12 +8,12 @@
// 1 = everything
const int V = 0;
-const device_type H8_ADC_3337 = &device_creator<h8_adc_3337_device>;
-const device_type H8_ADC_3006 = &device_creator<h8_adc_3006_device>;
-const device_type H8_ADC_2245 = &device_creator<h8_adc_2245_device>;
-const device_type H8_ADC_2320 = &device_creator<h8_adc_2320_device>;
-const device_type H8_ADC_2357 = &device_creator<h8_adc_2357_device>;
-const device_type H8_ADC_2655 = &device_creator<h8_adc_2655_device>;
+const device_type H8_ADC_3337 = device_creator<h8_adc_3337_device>;
+const device_type H8_ADC_3006 = device_creator<h8_adc_3006_device>;
+const device_type H8_ADC_2245 = device_creator<h8_adc_2245_device>;
+const device_type H8_ADC_2320 = device_creator<h8_adc_2320_device>;
+const device_type H8_ADC_2357 = device_creator<h8_adc_2357_device>;
+const device_type H8_ADC_2655 = device_creator<h8_adc_2655_device>;
h8_adc_device::h8_adc_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/cpu/h8/h8_dma.cpp b/src/devices/cpu/h8/h8_dma.cpp
index e3ce2ccc939..af27444c64c 100644
--- a/src/devices/cpu/h8/h8_dma.cpp
+++ b/src/devices/cpu/h8/h8_dma.cpp
@@ -1,8 +1,8 @@
#include "emu.h"
#include "h8_dma.h"
-const device_type H8_DMA = &device_creator<h8_dma_device>;
-const device_type H8_DMA_CHANNEL = &device_creator<h8_dma_channel_device>;
+const device_type H8_DMA = device_creator<h8_dma_device>;
+const device_type H8_DMA_CHANNEL = device_creator<h8_dma_channel_device>;
h8_dma_device::h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, H8_DMA, "H8 DMA controller", tag, owner, clock, "h8_dma", __FILE__),
diff --git a/src/devices/cpu/h8/h8_dtc.cpp b/src/devices/cpu/h8/h8_dtc.cpp
index 117740cdd4b..9ea8037ff37 100644
--- a/src/devices/cpu/h8/h8_dtc.cpp
+++ b/src/devices/cpu/h8/h8_dtc.cpp
@@ -7,7 +7,7 @@
// 2 = everything
const int V = 0;
-const device_type H8_DTC = &device_creator<h8_dtc_device>;
+const device_type H8_DTC = device_creator<h8_dtc_device>;
const int h8_dtc_device::vector_to_enable[92] = {
-1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7
diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp
index d81d53ccfe7..98f0b8de61e 100644
--- a/src/devices/cpu/h8/h8_intc.cpp
+++ b/src/devices/cpu/h8/h8_intc.cpp
@@ -3,9 +3,9 @@
#include "emu.h"
#include "h8_intc.h"
-const device_type H8_INTC = &device_creator<h8_intc_device>;
-const device_type H8H_INTC = &device_creator<h8h_intc_device>;
-const device_type H8S_INTC = &device_creator<h8s_intc_device>;
+const device_type H8_INTC = device_creator<h8_intc_device>;
+const device_type H8H_INTC = device_creator<h8h_intc_device>;
+const device_type H8S_INTC = device_creator<h8s_intc_device>;
h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, H8_INTC, "H8 INTC", tag, owner, clock, "h8_intc", __FILE__),
diff --git a/src/devices/cpu/h8/h8_port.cpp b/src/devices/cpu/h8/h8_port.cpp
index e319748d01a..ec61a0fd196 100644
--- a/src/devices/cpu/h8/h8_port.cpp
+++ b/src/devices/cpu/h8/h8_port.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h8_port.h"
-const device_type H8_PORT = &device_creator<h8_port_device>;
+const device_type H8_PORT = device_creator<h8_port_device>;
h8_port_device::h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, H8_PORT, "H8 digital port", tag, owner, clock, "h8_digital_port", __FILE__),
diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp
index 7a426ad65ec..8d6ea7163a1 100644
--- a/src/devices/cpu/h8/h8_sci.cpp
+++ b/src/devices/cpu/h8/h8_sci.cpp
@@ -11,7 +11,7 @@
const int V = 1;
-const device_type H8_SCI = &device_creator<h8_sci_device>;
+const device_type H8_SCI = device_creator<h8_sci_device>;
const char *const h8_sci_device::state_names[] = { "idle", "start", "bit", "parity", "stop", "last-tick" };
diff --git a/src/devices/cpu/h8/h8_timer16.cpp b/src/devices/cpu/h8/h8_timer16.cpp
index 2beb6d86c61..a35690b78bf 100644
--- a/src/devices/cpu/h8/h8_timer16.cpp
+++ b/src/devices/cpu/h8/h8_timer16.cpp
@@ -8,10 +8,10 @@
// 1 = everything
const int V = 0;
-const device_type H8_TIMER16 = &device_creator<h8_timer16_device>;
-const device_type H8_TIMER16_CHANNEL = &device_creator<h8_timer16_channel_device>;
-const device_type H8H_TIMER16_CHANNEL = &device_creator<h8h_timer16_channel_device>;
-const device_type H8S_TIMER16_CHANNEL = &device_creator<h8s_timer16_channel_device>;
+const device_type H8_TIMER16 = device_creator<h8_timer16_device>;
+const device_type H8_TIMER16_CHANNEL = device_creator<h8_timer16_channel_device>;
+const device_type H8H_TIMER16_CHANNEL = device_creator<h8h_timer16_channel_device>;
+const device_type H8S_TIMER16_CHANNEL = device_creator<h8s_timer16_channel_device>;
h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, H8_TIMER16_CHANNEL, "H8 16-bits timer channel", tag, owner, clock, "h8_16bits_timer_channel", __FILE__),
diff --git a/src/devices/cpu/h8/h8_timer8.cpp b/src/devices/cpu/h8/h8_timer8.cpp
index 93538817313..4bac2b89f0d 100644
--- a/src/devices/cpu/h8/h8_timer8.cpp
+++ b/src/devices/cpu/h8/h8_timer8.cpp
@@ -9,8 +9,8 @@
// 2 = everything
const int V = 1;
-const device_type H8_TIMER8_CHANNEL = &device_creator<h8_timer8_channel_device>;
-const device_type H8H_TIMER8_CHANNEL = &device_creator<h8h_timer8_channel_device>;
+const device_type H8_TIMER8_CHANNEL = device_creator<h8_timer8_channel_device>;
+const device_type H8H_TIMER8_CHANNEL = device_creator<h8h_timer8_channel_device>;
h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, H8_TIMER8_CHANNEL, "H8 8-bits timer channel", tag, owner, clock, "h8_8bits_timer_channel", __FILE__),
diff --git a/src/devices/cpu/h8/h8_watchdog.cpp b/src/devices/cpu/h8/h8_watchdog.cpp
index 286be74c208..5ace536ac7a 100644
--- a/src/devices/cpu/h8/h8_watchdog.cpp
+++ b/src/devices/cpu/h8/h8_watchdog.cpp
@@ -1,7 +1,7 @@
#include "emu.h"
#include "h8_watchdog.h"
-const device_type H8_WATCHDOG = &device_creator<h8_watchdog_device>;
+const device_type H8_WATCHDOG = device_creator<h8_watchdog_device>;
const int h8_watchdog_device::div_bh[8] = { 1, 6, 7, 9, 11, 13, 15, 17 };
const int h8_watchdog_device::div_s [8] = { 1, 5, 6, 7, 8, 9, 11, 12 };
diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp
index 20cc8bbc237..cbb3a5e91d1 100644
--- a/src/devices/cpu/h8/h8s2245.cpp
+++ b/src/devices/cpu/h8/h8s2245.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "h8s2245.h"
-const device_type H8S2241 = &device_creator<h8s2241_device>;
-const device_type H8S2242 = &device_creator<h8s2242_device>;
-const device_type H8S2245 = &device_creator<h8s2245_device>;
-const device_type H8S2246 = &device_creator<h8s2246_device>;
+const device_type H8S2241 = device_creator<h8s2241_device>;
+const device_type H8S2242 = device_creator<h8s2242_device>;
+const device_type H8S2245 = device_creator<h8s2245_device>;
+const device_type H8S2246 = device_creator<h8s2246_device>;
h8s2245_device::h8s2245_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) :
diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp
index 073725dcd3e..e2951a0d2a1 100644
--- a/src/devices/cpu/h8/h8s2320.cpp
+++ b/src/devices/cpu/h8/h8s2320.cpp
@@ -3,15 +3,15 @@
#include "emu.h"
#include "h8s2320.h"
-const device_type H8S2320 = &device_creator<h8s2320_device>;
-const device_type H8S2321 = &device_creator<h8s2321_device>;
-const device_type H8S2322 = &device_creator<h8s2322_device>;
-const device_type H8S2323 = &device_creator<h8s2323_device>;
-const device_type H8S2324 = &device_creator<h8s2324_device>;
-const device_type H8S2326 = &device_creator<h8s2326_device>;
-const device_type H8S2327 = &device_creator<h8s2327_device>;
-const device_type H8S2328 = &device_creator<h8s2328_device>;
-const device_type H8S2329 = &device_creator<h8s2329_device>;
+const device_type H8S2320 = device_creator<h8s2320_device>;
+const device_type H8S2321 = device_creator<h8s2321_device>;
+const device_type H8S2322 = device_creator<h8s2322_device>;
+const device_type H8S2323 = device_creator<h8s2323_device>;
+const device_type H8S2324 = device_creator<h8s2324_device>;
+const device_type H8S2326 = device_creator<h8s2326_device>;
+const device_type H8S2327 = device_creator<h8s2327_device>;
+const device_type H8S2328 = device_creator<h8s2328_device>;
+const device_type H8S2329 = device_creator<h8s2329_device>;
h8s2320_device::h8s2320_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) :
diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp
index c600904ba83..b143a566933 100644
--- a/src/devices/cpu/h8/h8s2357.cpp
+++ b/src/devices/cpu/h8/h8s2357.cpp
@@ -3,12 +3,12 @@
#include "emu.h"
#include "h8s2357.h"
-const device_type H8S2357 = &device_creator<h8s2357_device>;
-const device_type H8S2352 = &device_creator<h8s2352_device>;
-const device_type H8S2398 = &device_creator<h8s2398_device>;
-const device_type H8S2394 = &device_creator<h8s2394_device>;
-const device_type H8S2392 = &device_creator<h8s2392_device>;
-const device_type H8S2390 = &device_creator<h8s2390_device>;
+const device_type H8S2357 = device_creator<h8s2357_device>;
+const device_type H8S2352 = device_creator<h8s2352_device>;
+const device_type H8S2398 = device_creator<h8s2398_device>;
+const device_type H8S2394 = device_creator<h8s2394_device>;
+const device_type H8S2392 = device_creator<h8s2392_device>;
+const device_type H8S2390 = device_creator<h8s2390_device>;
h8s2357_device::h8s2357_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) :
h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2357_device::map), this)),
diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp
index 14610e9161d..b95fb91ad68 100644
--- a/src/devices/cpu/h8/h8s2655.cpp
+++ b/src/devices/cpu/h8/h8s2655.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "h8s2655.h"
-const device_type H8S2655 = &device_creator<h8s2655_device>;
-const device_type H8S2653 = &device_creator<h8s2653_device>;
+const device_type H8S2655 = device_creator<h8s2655_device>;
+const device_type H8S2653 = device_creator<h8s2653_device>;
h8s2655_device::h8s2655_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) :
h8s2600_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2655_device::map), this)),
diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp
index 59930adceec..0a0e5a29ea0 100644
--- a/src/devices/cpu/hcd62121/hcd62121.cpp
+++ b/src/devices/cpu/hcd62121/hcd62121.cpp
@@ -30,7 +30,7 @@ constexpr u8 FLAG_CL = 0x01;
constexpr u8 FLAG_ZH = 0x10;
-const device_type HCD62121 = &device_creator<hcd62121_cpu_device>;
+const device_type HCD62121 = device_creator<hcd62121_cpu_device>;
hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp
index c7c646a7a4b..92201470a6c 100644
--- a/src/devices/cpu/hd61700/hd61700.cpp
+++ b/src/devices/cpu/hd61700/hd61700.cpp
@@ -95,7 +95,7 @@ static const uint16_t irq_vector[] = {0x0032, 0x0042, 0x0052, 0x0062, 0x0072};
// HD61700 DEVICE
//**************************************************************************
-const device_type HD61700 = &device_creator<hd61700_cpu_device>;
+const device_type HD61700 = device_creator<hd61700_cpu_device>;
//-------------------------------------------------
// hd61700_cpu_device - constructor
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index 0023956f8d4..71b038bcd1b 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -22,36 +22,36 @@
// MCU types
// HMCS42/C/CL
-//const device_type HD38702 = &device_creator<hd38702_device>; // PMOS, 28 pins, 22 I/O lines, (512+32)x10 ROM, 32x4 RAM, no B or SPY register
-//const device_type HD44700 = &device_creator<hd44700_device>; // CMOS version
-//const device_type HD44708 = &device_creator<hd44708_device>; // CMOS version, low-power
+//const device_type HD38702 = device_creator<hd38702_device>; // PMOS, 28 pins, 22 I/O lines, (512+32)x10 ROM, 32x4 RAM, no B or SPY register
+//const device_type HD44700 = device_creator<hd44700_device>; // CMOS version
+//const device_type HD44708 = device_creator<hd44708_device>; // CMOS version, low-power
// HMCS43/C/CL
-const device_type HD38750 = &device_creator<hd38750_device>; // PMOS, 42 pins, 32 I/O lines, (1024+64)x10 ROM, 80x4 RAM
-const device_type HD38755 = &device_creator<hd38755_device>; // ceramic filter oscillator type
-const device_type HD44750 = &device_creator<hd44750_device>; // CMOS version
-const device_type HD44758 = &device_creator<hd44758_device>; // CMOS version, low-power
+const device_type HD38750 = device_creator<hd38750_device>; // PMOS, 42 pins, 32 I/O lines, (1024+64)x10 ROM, 80x4 RAM
+const device_type HD38755 = device_creator<hd38755_device>; // ceramic filter oscillator type
+const device_type HD44750 = device_creator<hd44750_device>; // CMOS version
+const device_type HD44758 = device_creator<hd44758_device>; // CMOS version, low-power
// HMCS44A/C/CL
-const device_type HD38800 = &device_creator<hd38800_device>; // PMOS, 42 pins, 32 I/O lines, (2048+128)x10 ROM, 160x4 RAM
-const device_type HD38805 = &device_creator<hd38805_device>; // ceramic filter oscillator type
-const device_type HD44801 = &device_creator<hd44801_device>; // CMOS version
-const device_type HD44808 = &device_creator<hd44808_device>; // CMOS version, low-power
+const device_type HD38800 = device_creator<hd38800_device>; // PMOS, 42 pins, 32 I/O lines, (2048+128)x10 ROM, 160x4 RAM
+const device_type HD38805 = device_creator<hd38805_device>; // ceramic filter oscillator type
+const device_type HD44801 = device_creator<hd44801_device>; // CMOS version
+const device_type HD44808 = device_creator<hd44808_device>; // CMOS version, low-power
// HMCS45A/C/CL
-const device_type HD38820 = &device_creator<hd38820_device>; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, (2048+128)x10 ROM, 160x4 RAM
-const device_type HD38825 = &device_creator<hd38825_device>; // ceramic filter oscillator type
-const device_type HD44820 = &device_creator<hd44820_device>; // CMOS version
-const device_type HD44828 = &device_creator<hd44828_device>; // CMOS version, low-power
+const device_type HD38820 = device_creator<hd38820_device>; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, (2048+128)x10 ROM, 160x4 RAM
+const device_type HD38825 = device_creator<hd38825_device>; // ceramic filter oscillator type
+const device_type HD44820 = device_creator<hd44820_device>; // CMOS version
+const device_type HD44828 = device_creator<hd44828_device>; // CMOS version, low-power
// HMCS46C/CL (no PMOS version exists)
-//const device_type HD44840 = &device_creator<hd44840_device>; // CMOS, 42 pins, 32 I/O lines, 4096x10 ROM, 256x4 RAM
-//const device_type HD44848 = &device_creator<hd44848_device>; // CMOS, low-power
+//const device_type HD44840 = device_creator<hd44840_device>; // CMOS, 42 pins, 32 I/O lines, 4096x10 ROM, 256x4 RAM
+//const device_type HD44848 = device_creator<hd44848_device>; // CMOS, low-power
// HMCS47A/C/CL
-//const device_type HD38870 = &device_creator<hd38870_device>; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, 4096x10 ROM, 256x4 RAM
-//const device_type HD44860 = &device_creator<hd44860_device>; // CMOS version
-//const device_type HD44868 = &device_creator<hd44868_device>; // CMOS version, low-power
+//const device_type HD38870 = device_creator<hd38870_device>; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, 4096x10 ROM, 256x4 RAM
+//const device_type HD44860 = device_creator<hd44860_device>; // CMOS version
+//const device_type HD44868 = device_creator<hd44868_device>; // CMOS version, low-power
// internal memory maps
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index d2930111c2e..47477503f05 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -101,8 +101,8 @@ enum {
// Part of r32-r37 that is actually output as address extension (6 bits of "BSC": block select code)
#define BSC_REG_MASK 0x3f
-const device_type HP_5061_3001 = &device_creator<hp_5061_3001_cpu_device>;
-const device_type HP_5061_3011 = &device_creator<hp_5061_3011_cpu_device>;
+const device_type HP_5061_3001 = device_creator<hp_5061_3001_cpu_device>;
+const device_type HP_5061_3011 = device_creator<hp_5061_3011_cpu_device>;
WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w)
{
diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp
index 00321d2e364..4a90418770a 100644
--- a/src/devices/cpu/i386/i386.cpp
+++ b/src/devices/cpu/i386/i386.cpp
@@ -27,16 +27,16 @@
/* seems to be defined on mingw-gcc */
#undef i386
-const device_type I386 = &device_creator<i386_device>;
-const device_type I386SX = &device_creator<i386SX_device>;
-const device_type I486 = &device_creator<i486_device>;
-const device_type PENTIUM = &device_creator<pentium_device>;
-const device_type MEDIAGX = &device_creator<mediagx_device>;
-const device_type PENTIUM_PRO = &device_creator<pentium_pro_device>;
-const device_type PENTIUM_MMX = &device_creator<pentium_mmx_device>;
-const device_type PENTIUM2 = &device_creator<pentium2_device>;
-const device_type PENTIUM3 = &device_creator<pentium3_device>;
-const device_type PENTIUM4 = &device_creator<pentium4_device>;
+const device_type I386 = device_creator<i386_device>;
+const device_type I386SX = device_creator<i386SX_device>;
+const device_type I486 = device_creator<i486_device>;
+const device_type PENTIUM = device_creator<pentium_device>;
+const device_type MEDIAGX = device_creator<mediagx_device>;
+const device_type PENTIUM_PRO = device_creator<pentium_pro_device>;
+const device_type PENTIUM_MMX = device_creator<pentium_mmx_device>;
+const device_type PENTIUM2 = device_creator<pentium2_device>;
+const device_type PENTIUM3 = device_creator<pentium3_device>;
+const device_type PENTIUM4 = device_creator<pentium4_device>;
i386_device::i386_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/i4004/i4004.cpp b/src/devices/cpu/i4004/i4004.cpp
index eaaae3b8148..58fce33bdc4 100644
--- a/src/devices/cpu/i4004/i4004.cpp
+++ b/src/devices/cpu/i4004/i4004.cpp
@@ -21,7 +21,7 @@ static const uint8_t kbp_table[] = { 0x00,0x01,0x02,0x0f,0x03,0x0f,0x0f,0x0f,0x0
#define GET_PC (m_ADDR[m_pc_pos])
-const device_type I4004 = &device_creator<i4004_cpu_device>;
+const device_type I4004 = device_creator<i4004_cpu_device>;
i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp
index f55dac14b88..18bf62d4f46 100644
--- a/src/devices/cpu/i8008/i8008.cpp
+++ b/src/devices/cpu/i8008/i8008.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type I8008 = &device_creator<i8008_device>;
+const device_type I8008 = device_creator<i8008_device>;
//**************************************************************************
// DEVICE INTERFACE
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index f60e594bad9..febb71e1a46 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -177,9 +177,9 @@ M_CALL 8085 11 +7(18) -2(9)
*/
-const device_type I8080 = &device_creator<i8080_cpu_device>;
-const device_type I8080A = &device_creator<i8080a_cpu_device>;
-const device_type I8085A = &device_creator<i8085a_cpu_device>;
+const device_type I8080 = device_creator<i8080_cpu_device>;
+const device_type I8080A = device_creator<i8080a_cpu_device>;
+const device_type I8085A = device_creator<i8085a_cpu_device>;
i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index a18d62b7f4a..9b1ada7b1f6 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I8089 = &device_creator<i8089_device>;
+const device_type I8089 = device_creator<i8089_device>;
//**************************************************************************
diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp
index cbfd60b2280..8cfcdc6cca7 100644
--- a/src/devices/cpu/i8089/i8089_channel.cpp
+++ b/src/devices/cpu/i8089/i8089_channel.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I8089_CHANNEL = &device_creator<i8089_channel>;
+const device_type I8089_CHANNEL = device_creator<i8089_channel>;
//**************************************************************************
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 4ed045460d1..e8c3f280937 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -118,8 +118,8 @@ const uint8_t i80186_cpu_device::m_i80186_timing[] =
33, /* (80186) BOUND */
};
-const device_type I80186 = &device_creator<i80186_cpu_device>;
-const device_type I80188 = &device_creator<i80188_cpu_device>;
+const device_type I80186 = device_creator<i80186_cpu_device>;
+const device_type I80188 = device_creator<i80188_cpu_device>;
i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: i80186_cpu_device(mconfig, I80188, "I80188", tag, owner, clock, "i80188", __FILE__, 8)
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index 1cb06fd0298..44232141fa9 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -165,7 +165,7 @@ const uint8_t i80286_cpu_device::m_i80286_timing[] =
13, /* (80186) BOUND */
};
-const device_type I80286 = &device_creator<i80286_cpu_device>;
+const device_type I80286 = device_creator<i80286_cpu_device>;
i80286_cpu_device::i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: i8086_common_cpu_device(mconfig, I80286, "I80286", tag, owner, clock, "i80286", __FILE__)
diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp
index ad3efd8a46c..5ba581d4656 100644
--- a/src/devices/cpu/i86/i86.cpp
+++ b/src/devices/cpu/i86/i86.cpp
@@ -87,8 +87,8 @@ const uint8_t i8086_cpu_device::m_i8086_timing[] =
/***************************************************************************/
-const device_type I8086 = &device_creator<i8086_cpu_device>;
-const device_type I8088 = &device_creator<i8088_cpu_device>;
+const device_type I8086 = device_creator<i8086_cpu_device>;
+const device_type I8088 = device_creator<i8088_cpu_device>;
i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: i8086_cpu_device(mconfig, I8088, "I8088", tag, owner, clock, "i8088", __FILE__, 8)
diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp
index 199a410b2db..b894ebc8c3f 100644
--- a/src/devices/cpu/i860/i860.cpp
+++ b/src/devices/cpu/i860/i860.cpp
@@ -31,7 +31,7 @@ enum {
};
-const device_type I860 = &device_creator<i860_cpu_device>;
+const device_type I860 = device_creator<i860_cpu_device>;
i860_cpu_device::i860_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp
index 9bc4386d182..1aec8b3b115 100644
--- a/src/devices/cpu/i960/i960.cpp
+++ b/src/devices/cpu/i960/i960.cpp
@@ -13,7 +13,7 @@ CPU_DISASSEMBLE( i960 );
#endif
-const device_type I960 = &device_creator<i960_cpu_device>;
+const device_type I960 = device_creator<i960_cpu_device>;
i960_cpu_device::i960_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp
index eeebbe2cd4c..9da2a0f03eb 100644
--- a/src/devices/cpu/ie15/ie15.cpp
+++ b/src/devices/cpu/ie15/ie15.cpp
@@ -1,9 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
#include "emu.h"
-#include "debugger.h"
#include "ie15.h"
+#include "debugger.h"
+
+
//**************************************************************************
// MACROS
//**************************************************************************
@@ -19,7 +21,7 @@
//**************************************************************************
// device type definition
-const device_type IE15 = &device_creator<ie15_device>;
+const device_type IE15 = device_creator<ie15_device>;
//**************************************************************************
// DEVICE INTERFACE
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index 1a3d7d9f41e..51ac4db16ff 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -136,8 +136,8 @@ const jaguar_cpu_device::op_func jaguar_cpu_device::dsp_op_table[64] =
#define ROPCODE(pc) (m_direct->read_word(pc, WORD_XOR_BE(0)))
-const device_type JAGUARGPU = &device_creator<jaguargpu_cpu_device>;
-const device_type JAGUARDSP = &device_creator<jaguardsp_cpu_device>;
+const device_type JAGUARGPU = device_creator<jaguargpu_cpu_device>;
+const device_type JAGUARDSP = device_creator<jaguardsp_cpu_device>;
jaguar_cpu_device::jaguar_cpu_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, bool isdsp)
diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp
index 71e674c9221..7e16ecb8824 100644
--- a/src/devices/cpu/lc8670/lc8670.cpp
+++ b/src/devices/cpu/lc8670/lc8670.cpp
@@ -31,7 +31,7 @@
// CONSTANTS
//**************************************************************************
-const device_type LC8670 = &device_creator<lc8670_cpu_device>;
+const device_type LC8670 = device_creator<lc8670_cpu_device>;
//**************************************************************************
diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp
index 80c218d9e47..b7467695a68 100644
--- a/src/devices/cpu/lh5801/lh5801.cpp
+++ b/src/devices/cpu/lh5801/lh5801.cpp
@@ -62,7 +62,7 @@ enum
#define H 0x10
-const device_type LH5801 = &device_creator<lh5801_cpu_device>;
+const device_type LH5801 = device_creator<lh5801_cpu_device>;
lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp
index 137337be5be..5602a19d721 100644
--- a/src/devices/cpu/lr35902/lr35902.cpp
+++ b/src/devices/cpu/lr35902/lr35902.cpp
@@ -60,7 +60,7 @@ enum lr35902_flag
// LR35902 DEVICE
//**************************************************************************
-const device_type LR35902 = &device_creator<lr35902_cpu_device>;
+const device_type LR35902 = device_creator<lr35902_cpu_device>;
lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp
index 8da01b9b843..44af6a383cc 100644
--- a/src/devices/cpu/m37710/m37710.cpp
+++ b/src/devices/cpu/m37710/m37710.cpp
@@ -62,9 +62,9 @@
#define M37710_DEBUG (0) // enables verbose logging for peripherals, etc.
-const device_type M37702M2 = &device_creator<m37702m2_device>;
-const device_type M37702S1 = &device_creator<m37702s1_device>;
-const device_type M37710S4 = &device_creator<m37710s4_device>;
+const device_type M37702M2 = device_creator<m37702m2_device>;
+const device_type M37702S1 = device_creator<m37702s1_device>;
+const device_type M37710S4 = device_creator<m37710s4_device>;
// On-board RAM, ROM, and peripherals
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp
index d6ad1c7077a..b32db04191b 100644
--- a/src/devices/cpu/m6502/deco16.cpp
+++ b/src/devices/cpu/m6502/deco16.cpp
@@ -13,7 +13,7 @@
#define DECO16_VERBOSE 1
-const device_type DECO16 = &device_creator<deco16_device>;
+const device_type DECO16 = device_creator<deco16_device>;
deco16_device::deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__),
diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp
index 22de70eec42..bbb46b9eb49 100644
--- a/src/devices/cpu/m6502/m3745x.cpp
+++ b/src/devices/cpu/m6502/m3745x.cpp
@@ -28,7 +28,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type M37450 = &device_creator<m37450_device>;
+const device_type M37450 = device_creator<m37450_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp
index 61a4f9d8c8f..45f2c369b3e 100644
--- a/src/devices/cpu/m6502/m4510.cpp
+++ b/src/devices/cpu/m6502/m4510.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m4510.h"
-const device_type M4510 = &device_creator<m4510_device>;
+const device_type M4510 = device_creator<m4510_device>;
m4510_device::m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__),
diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp
index a486691c678..9ea21e760cb 100644
--- a/src/devices/cpu/m6502/m5074x.cpp
+++ b/src/devices/cpu/m6502/m5074x.cpp
@@ -29,8 +29,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type M50740 = &device_creator<m50740_device>;
-const device_type M50741 = &device_creator<m50741_device>;
+const device_type M50740 = device_creator<m50740_device>;
+const device_type M50741 = device_creator<m50741_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index af1110957cb..b6a93b00769 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -12,7 +12,7 @@
#include "debugger.h"
#include "m6502.h"
-const device_type M6502 = &device_creator<m6502_device>;
+const device_type M6502 = device_creator<m6502_device>;
m6502_device::m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cpu_device(mconfig, M6502, "M6502", tag, owner, clock, "m6502", __FILE__),
diff --git a/src/devices/cpu/m6502/m6504.cpp b/src/devices/cpu/m6502/m6504.cpp
index a2a2f006d1b..4ec4c9ecb31 100644
--- a/src/devices/cpu/m6502/m6504.cpp
+++ b/src/devices/cpu/m6502/m6504.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m6504.h"
-const device_type M6504 = &device_creator<m6504_device>;
+const device_type M6504 = device_creator<m6504_device>;
m6504_device::m6504_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M6504, "M6504", tag, owner, clock, "m6504", __FILE__)
diff --git a/src/devices/cpu/m6502/m6507.cpp b/src/devices/cpu/m6502/m6507.cpp
index 85855f75aab..21bb42dbd3e 100644
--- a/src/devices/cpu/m6502/m6507.cpp
+++ b/src/devices/cpu/m6502/m6507.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m6507.h"
-const device_type M6507 = &device_creator<m6507_device>;
+const device_type M6507 = device_creator<m6507_device>;
m6507_device::m6507_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M6507, "M6507", tag, owner, clock, "m6507", __FILE__)
diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp
index e0fcedd75cf..5241c36d88a 100644
--- a/src/devices/cpu/m6502/m6509.cpp
+++ b/src/devices/cpu/m6502/m6509.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m6509.h"
-const device_type M6509 = &device_creator<m6509_device>;
+const device_type M6509 = device_creator<m6509_device>;
m6509_device::m6509_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M6509, "M6509", tag, owner, clock, "m6509", __FILE__), XPC(0), bank_i(0), bank_y(0)
diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp
index c2f59403780..e1aa0937f76 100644
--- a/src/devices/cpu/m6502/m6510.cpp
+++ b/src/devices/cpu/m6502/m6510.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m6510.h"
-const device_type M6510 = &device_creator<m6510_device>;
+const device_type M6510 = device_creator<m6510_device>;
m6510_device::m6510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M6510, "M6510", tag, owner, clock, "m6510", __FILE__),
diff --git a/src/devices/cpu/m6502/m6510t.cpp b/src/devices/cpu/m6502/m6510t.cpp
index 6b9bb1f16ad..c2d9e750f5a 100644
--- a/src/devices/cpu/m6502/m6510t.cpp
+++ b/src/devices/cpu/m6502/m6510t.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m6510t.h"
-const device_type M6510T = &device_creator<m6510t_device>;
+const device_type M6510T = device_creator<m6510t_device>;
m6510t_device::m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6510_device(mconfig, M6510T, "M6510T", tag, owner, clock, "m6510t", __FILE__)
diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp
index 1d9d158bf29..9f0a1d4cc9e 100644
--- a/src/devices/cpu/m6502/m65c02.cpp
+++ b/src/devices/cpu/m6502/m65c02.cpp
@@ -12,7 +12,7 @@
#include "emu.h"
#include "m65c02.h"
-const device_type M65C02 = &device_creator<m65c02_device>;
+const device_type M65C02 = device_creator<m65c02_device>;
m65c02_device::m65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M65C02, "M65C02", tag, owner, clock, "mc65c02", __FILE__)
diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp
index f45d3edcf47..0a167f75704 100644
--- a/src/devices/cpu/m6502/m65ce02.cpp
+++ b/src/devices/cpu/m6502/m65ce02.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m65ce02.h"
-const device_type M65CE02 = &device_creator<m65ce02_device>;
+const device_type M65CE02 = device_creator<m65ce02_device>;
m65ce02_device::m65ce02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m65c02_device(mconfig, M65CE02, "M65CE02", tag, owner, clock, "m65ce02", __FILE__), TMP3(0), Z(0), B(0)
diff --git a/src/devices/cpu/m6502/m65sc02.cpp b/src/devices/cpu/m6502/m65sc02.cpp
index e340fc0ca44..ae87d1ea78d 100644
--- a/src/devices/cpu/m6502/m65sc02.cpp
+++ b/src/devices/cpu/m6502/m65sc02.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m65sc02.h"
-const device_type M65SC02 = &device_creator<m65sc02_device>;
+const device_type M65SC02 = device_creator<m65sc02_device>;
m65sc02_device::m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
r65c02_device(mconfig, M65SC02, "M65SC02", tag, owner, clock, "m65sc02", __FILE__)
diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp
index 1f4c1cd45a4..9c4a45cce16 100644
--- a/src/devices/cpu/m6502/m740.cpp
+++ b/src/devices/cpu/m6502/m740.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m740.h"
-const device_type M740 = &device_creator<m740_device>;
+const device_type M740 = device_creator<m740_device>;
m740_device::m740_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6502_device(mconfig, M740, "M740", tag, owner, clock, "m740", __FILE__), m_irq_multiplex(0), m_irq_vector(0)
diff --git a/src/devices/cpu/m6502/m7501.cpp b/src/devices/cpu/m6502/m7501.cpp
index 54e7bdb7456..826ae10ad15 100644
--- a/src/devices/cpu/m6502/m7501.cpp
+++ b/src/devices/cpu/m6502/m7501.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m7501.h"
-const device_type M7501 = &device_creator<m7501_device>;
+const device_type M7501 = device_creator<m7501_device>;
m7501_device::m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6510_device(mconfig, M7501, "M7501", tag, owner, clock, "m7501", __FILE__)
diff --git a/src/devices/cpu/m6502/m8502.cpp b/src/devices/cpu/m6502/m8502.cpp
index 97d66d4431c..897bd3e00e2 100644
--- a/src/devices/cpu/m6502/m8502.cpp
+++ b/src/devices/cpu/m6502/m8502.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "m8502.h"
-const device_type M8502 = &device_creator<m8502_device>;
+const device_type M8502 = device_creator<m8502_device>;
m8502_device::m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m6510_device(mconfig, M8502, "M8502", tag, owner, clock, "m8502", __FILE__)
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index 338ee91c3e5..772f6ebda54 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "n2a03.h"
-const device_type N2A03 = &device_creator<n2a03_device>;
+const device_type N2A03 = device_creator<n2a03_device>;
READ8_MEMBER(n2a03_device::psg1_4014_r)
{
diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp
index 15594594360..eb6d85be265 100644
--- a/src/devices/cpu/m6502/r65c02.cpp
+++ b/src/devices/cpu/m6502/r65c02.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "r65c02.h"
-const device_type R65C02 = &device_creator<r65c02_device>;
+const device_type R65C02 = device_creator<r65c02_device>;
r65c02_device::r65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
m65c02_device(mconfig, R65C02, "R65C02", tag, owner, clock, "r65c02", __FILE__)
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index 520e46d1c24..67148eccaa2 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -520,16 +520,16 @@ const uint8_t m6800_cpu_device::cycles_nsc8105[256] =
}
-const device_type M6800 = &device_creator<m6800_cpu_device>;
-const device_type M6801 = &device_creator<m6801_cpu_device>;
-const device_type M6802 = &device_creator<m6802_cpu_device>;
-const device_type M6803 = &device_creator<m6803_cpu_device>;
-const device_type M6808 = &device_creator<m6808_cpu_device>;
-const device_type HD6301 = &device_creator<hd6301_cpu_device>;
-const device_type HD63701 = &device_creator<hd63701_cpu_device>;
-const device_type NSC8105 = &device_creator<nsc8105_cpu_device>;
-const device_type HD6303R = &device_creator<hd6303r_cpu_device>;
-const device_type HD6303Y = &device_creator<hd6303y_cpu_device>;
+const device_type M6800 = device_creator<m6800_cpu_device>;
+const device_type M6801 = device_creator<m6801_cpu_device>;
+const device_type M6802 = device_creator<m6802_cpu_device>;
+const device_type M6803 = device_creator<m6803_cpu_device>;
+const device_type M6808 = device_creator<m6808_cpu_device>;
+const device_type HD6301 = device_creator<hd6301_cpu_device>;
+const device_type HD63701 = device_creator<hd63701_cpu_device>;
+const device_type NSC8105 = device_creator<nsc8105_cpu_device>;
+const device_type HD6303R = device_creator<hd6303r_cpu_device>;
+const device_type HD6303Y = device_creator<hd6303y_cpu_device>;
m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 244ad3149c8..44c21eb8818 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -2271,7 +2271,7 @@ void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, uin
}
-const device_type M68K = &device_creator<m68000_base_device>;
+const device_type M68K = device_creator<m68000_base_device>;
//-------------------------------------------------
// h6280_device - constructor
@@ -2495,24 +2495,24 @@ const address_space_config *m68000_base_device::memory_space_config(address_spac
-const device_type M68000 = &device_creator<m68000_device>;
-const device_type M68301 = &device_creator<m68301_device>;
-const device_type M68008 = &device_creator<m68008_device>;
-const device_type M68008PLCC = &device_creator<m68008plcc_device>;
-const device_type M68010 = &device_creator<m68010_device>;
-const device_type M68EC020 = &device_creator<m68ec020_device>;
-const device_type M68020 = &device_creator<m68020_device>;
-const device_type M68020FPU = &device_creator<m68020fpu_device>;
-const device_type M68020PMMU = &device_creator<m68020pmmu_device>;
-const device_type M68020HMMU = &device_creator<m68020hmmu_device>;
-const device_type M68EC030 = &device_creator<m68ec030_device>;
-const device_type M68030 = &device_creator<m68030_device>;
-const device_type M68EC040 = &device_creator<m68ec040_device>;
-const device_type M68LC040 = &device_creator<m68lc040_device>;
-const device_type M68040 = &device_creator<m68040_device>;
-const device_type SCC68070 = &device_creator<scc68070_device>;
-const device_type FSCPU32 = &device_creator<fscpu32_device>;
-const device_type MCF5206E = &device_creator<mcf5206e_device>;
+const device_type M68000 = device_creator<m68000_device>;
+const device_type M68301 = device_creator<m68301_device>;
+const device_type M68008 = device_creator<m68008_device>;
+const device_type M68008PLCC = device_creator<m68008plcc_device>;
+const device_type M68010 = device_creator<m68010_device>;
+const device_type M68EC020 = device_creator<m68ec020_device>;
+const device_type M68020 = device_creator<m68020_device>;
+const device_type M68020FPU = device_creator<m68020fpu_device>;
+const device_type M68020PMMU = device_creator<m68020pmmu_device>;
+const device_type M68020HMMU = device_creator<m68020hmmu_device>;
+const device_type M68EC030 = device_creator<m68ec030_device>;
+const device_type M68030 = device_creator<m68030_device>;
+const device_type M68EC040 = device_creator<m68ec040_device>;
+const device_type M68LC040 = device_creator<m68lc040_device>;
+const device_type M68040 = device_creator<m68040_device>;
+const device_type SCC68070 = device_creator<scc68070_device>;
+const device_type FSCPU32 = device_creator<fscpu32_device>;
+const device_type MCF5206E = device_creator<mcf5206e_device>;
m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__)
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp
index 12af2c62007..a606077a021 100644
--- a/src/devices/cpu/m6805/m6805.cpp
+++ b/src/devices/cpu/m6805/m6805.cpp
@@ -707,6 +707,6 @@ void hd63705_device::interrupt_vector()
}
-const device_type M6805 = &device_creator<m6805_device>;
-const device_type M68HC05EG = &device_creator<m68hc05eg_device>;
-const device_type HD63705 = &device_creator<hd63705_device>;
+const device_type M6805 = device_creator<m6805_device>;
+const device_type M68HC05EG = device_creator<m68hc05eg_device>;
+const device_type HD63705 = device_creator<hd63705_device>;
diff --git a/src/devices/cpu/m6805/m68705.cpp b/src/devices/cpu/m6805/m68705.cpp
index 9c652a85e2d..b05f9c0431c 100644
--- a/src/devices/cpu/m6805/m68705.cpp
+++ b/src/devices/cpu/m6805/m68705.cpp
@@ -87,10 +87,10 @@ constexpr u16 M68705_INT_MASK = 0x03;
* Global variables
****************************************************************************/
-device_type const M68705P3 = &device_creator<m68705p3_device>;
-device_type const M68705P5 = &device_creator<m68705p5_device>;
-device_type const M68705R3 = &device_creator<m68705r3_device>;
-device_type const M68705U3 = &device_creator<m68705u3_device>;
+device_type const M68705P3 = device_creator<m68705p3_device>;
+device_type const M68705P5 = device_creator<m68705p5_device>;
+device_type const M68705R3 = device_creator<m68705r3_device>;
+device_type const M68705U3 = device_creator<m68705u3_device>;
/****************************************************************************
diff --git a/src/devices/cpu/m6805/m68hc05.cpp b/src/devices/cpu/m6805/m68hc05.cpp
index 00db265d782..352f5e99f1a 100644
--- a/src/devices/cpu/m6805/m68hc05.cpp
+++ b/src/devices/cpu/m6805/m68hc05.cpp
@@ -89,9 +89,9 @@ constexpr u16 M68HC05_INT_MASK = M68HC05_INT_IRQ | M68HC05_INT_TIMER;
* Global variables
****************************************************************************/
-device_type const M68HC05C4 = &device_creator<m68hc05c4_device>;
-device_type const M68HC05C8 = &device_creator<m68hc05c8_device>;
-device_type const M68HC705C8A = &device_creator<m68hc705c8a_device>;
+device_type const M68HC05C4 = device_creator<m68hc05c4_device>;
+device_type const M68HC05C8 = device_creator<m68hc05c8_device>;
+device_type const M68HC705C8A = device_creator<m68hc705c8a_device>;
diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp
index d8227c6162f..25673b0d761 100644
--- a/src/devices/cpu/m6809/hd6309.cpp
+++ b/src/devices/cpu/m6809/hd6309.cpp
@@ -124,7 +124,7 @@ March 2013 NPW:
// DEVICE INTERFACE
//**************************************************************************
-const device_type HD6309 = &device_creator<hd6309_device>;
+const device_type HD6309 = device_creator<hd6309_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp
index ba6acfe05a5..e8114c7e75d 100644
--- a/src/devices/cpu/m6809/konami.cpp
+++ b/src/devices/cpu/m6809/konami.cpp
@@ -77,7 +77,7 @@ March 2013 NPW:
// DEVICE INTERFACE
//**************************************************************************
-const device_type KONAMI = &device_creator<konami_cpu_device>;
+const device_type KONAMI = device_creator<konami_cpu_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index 27b15dc97a5..f3c6e1584ca 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -103,8 +103,8 @@ March 2013 NPW:
// DEVICE INTERFACE
//**************************************************************************
-const device_type M6809 = &device_creator<m6809_device>;
-const device_type M6809E = &device_creator<m6809e_device>;
+const device_type M6809 = device_creator<m6809_device>;
+const device_type M6809E = device_creator<m6809e_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp
index d37ae61e740..3ba9afdc1ad 100644
--- a/src/devices/cpu/mb86233/mb86233.cpp
+++ b/src/devices/cpu/mb86233/mb86233.cpp
@@ -20,7 +20,7 @@
#include "mb86233.h"
-const device_type MB86233 = &device_creator<mb86233_cpu_device>;
+const device_type MB86233 = device_creator<mb86233_cpu_device>;
mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp
index 44a1d596310..c2a2d1e2c88 100644
--- a/src/devices/cpu/mb86235/mb86235.cpp
+++ b/src/devices/cpu/mb86235/mb86235.cpp
@@ -28,7 +28,7 @@
-const device_type MB86235 = &device_creator<mb86235_device>;
+const device_type MB86235 = device_creator<mb86235_device>;
static ADDRESS_MAP_START(internal_abus, AS_DATA, 32, mb86235_device)
diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp
index 0c3c8b70758..3d0b88b2382 100644
--- a/src/devices/cpu/mb88xx/mb88xx.cpp
+++ b/src/devices/cpu/mb88xx/mb88xx.cpp
@@ -20,13 +20,13 @@
#include "mb88xx.h"
-const device_type MB88 = &device_creator<mb88_cpu_device>;
-const device_type MB88201 = &device_creator<mb88201_cpu_device>;
-const device_type MB88202 = &device_creator<mb88202_cpu_device>;
-const device_type MB8841 = &device_creator<mb8841_cpu_device>;
-const device_type MB8842 = &device_creator<mb8842_cpu_device>;
-const device_type MB8843 = &device_creator<mb8843_cpu_device>;
-const device_type MB8844 = &device_creator<mb8844_cpu_device>;
+const device_type MB88 = device_creator<mb88_cpu_device>;
+const device_type MB88201 = device_creator<mb88201_cpu_device>;
+const device_type MB88202 = device_creator<mb88202_cpu_device>;
+const device_type MB8841 = device_creator<mb8841_cpu_device>;
+const device_type MB8842 = device_creator<mb8842_cpu_device>;
+const device_type MB8843 = device_creator<mb8843_cpu_device>;
+const device_type MB8844 = device_creator<mb8844_cpu_device>;
/***************************************************************************
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp
index c8eeec1ca23..e4405d4c1ec 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.cpp
+++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp
@@ -39,7 +39,7 @@ enum
static const int div_tab[4] = { 1, 4, 8, 16 };
-const device_type MC68HC11 = &device_creator<mc68hc11_cpu_device>;
+const device_type MC68HC11 = device_creator<mc68hc11_cpu_device>;
mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp
index 423c522c195..fd14f473852 100644
--- a/src/devices/cpu/mcs48/mcs48.cpp
+++ b/src/devices/cpu/mcs48/mcs48.cpp
@@ -149,25 +149,25 @@ T0 output clock
-const device_type I8021 = &device_creator<i8021_device>;
-const device_type I8022 = &device_creator<i8022_device>;
-const device_type I8035 = &device_creator<i8035_device>;
-const device_type I8048 = &device_creator<i8048_device>;
-const device_type I8648 = &device_creator<i8648_device>;
-const device_type I8748 = &device_creator<i8748_device>;
-const device_type I8039 = &device_creator<i8039_device>;
-const device_type I8049 = &device_creator<i8049_device>;
-const device_type I8749 = &device_creator<i8749_device>;
-const device_type I8040 = &device_creator<i8040_device>;
-const device_type I8050 = &device_creator<i8050_device>;
-const device_type I8041 = &device_creator<i8041_device>;
-const device_type I8741 = &device_creator<i8741_device>;
-const device_type I8042 = &device_creator<i8042_device>;
-const device_type I8242 = &device_creator<i8242_device>;
-const device_type I8742 = &device_creator<i8742_device>;
-const device_type MB8884 = &device_creator<mb8884_device>;
-const device_type N7751 = &device_creator<n7751_device>;
-const device_type M58715 = &device_creator<m58715_device>;
+const device_type I8021 = device_creator<i8021_device>;
+const device_type I8022 = device_creator<i8022_device>;
+const device_type I8035 = device_creator<i8035_device>;
+const device_type I8048 = device_creator<i8048_device>;
+const device_type I8648 = device_creator<i8648_device>;
+const device_type I8748 = device_creator<i8748_device>;
+const device_type I8039 = device_creator<i8039_device>;
+const device_type I8049 = device_creator<i8049_device>;
+const device_type I8749 = device_creator<i8749_device>;
+const device_type I8040 = device_creator<i8040_device>;
+const device_type I8050 = device_creator<i8050_device>;
+const device_type I8041 = device_creator<i8041_device>;
+const device_type I8741 = device_creator<i8741_device>;
+const device_type I8042 = device_creator<i8042_device>;
+const device_type I8242 = device_creator<i8242_device>;
+const device_type I8742 = device_creator<i8742_device>;
+const device_type MB8884 = device_creator<mb8884_device>;
+const device_type N7751 = device_creator<n7751_device>;
+const device_type M58715 = device_creator<m58715_device>;
/***************************************************************************
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index 9540acb00a0..30ea8d0198c 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -221,20 +221,20 @@ enum
};
-const device_type I8031 = &device_creator<i8031_device>;
-const device_type I8032 = &device_creator<i8032_device>;
-const device_type I8051 = &device_creator<i8051_device>;
-const device_type I8751 = &device_creator<i8751_device>;
-const device_type I8052 = &device_creator<i8052_device>;
-const device_type I8752 = &device_creator<i8752_device>;
-const device_type I80C31 = &device_creator<i80c31_device>;
-const device_type I80C51 = &device_creator<i80c51_device>;
-const device_type I87C51 = &device_creator<i87c51_device>;
-const device_type I80C32 = &device_creator<i80c32_device>;
-const device_type I80C52 = &device_creator<i80c52_device>;
-const device_type I87C52 = &device_creator<i87c52_device>;
-const device_type AT89C4051 = &device_creator<at89c4051_device>;
-const device_type DS5002FP = &device_creator<ds5002fp_device>;
+const device_type I8031 = device_creator<i8031_device>;
+const device_type I8032 = device_creator<i8032_device>;
+const device_type I8051 = device_creator<i8051_device>;
+const device_type I8751 = device_creator<i8751_device>;
+const device_type I8052 = device_creator<i8052_device>;
+const device_type I8752 = device_creator<i8752_device>;
+const device_type I80C31 = device_creator<i80c31_device>;
+const device_type I80C51 = device_creator<i80c51_device>;
+const device_type I87C51 = device_creator<i87c51_device>;
+const device_type I80C32 = device_creator<i80c32_device>;
+const device_type I80C52 = device_creator<i80c52_device>;
+const device_type I87C52 = device_creator<i87c52_device>;
+const device_type AT89C4051 = device_creator<at89c4051_device>;
+const device_type DS5002FP = device_creator<ds5002fp_device>;
/***************************************************************************
diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp
index a1302b5c3d7..6f78e7d00a9 100644
--- a/src/devices/cpu/mcs96/i8x9x.cpp
+++ b/src/devices/cpu/mcs96/i8x9x.cpp
@@ -368,7 +368,7 @@ p8098_device::p8098_device(const machine_config &mconfig, const char *tag, devic
{
}
-const device_type C8095 = &device_creator<c8095_device>;
-const device_type P8098 = &device_creator<p8098_device>;
+const device_type C8095 = device_creator<c8095_device>;
+const device_type P8098 = device_creator<p8098_device>;
#include "cpu/mcs96/i8x9x.hxx"
diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp
index b581f689300..b4089356f28 100644
--- a/src/devices/cpu/melps4/m58846.cpp
+++ b/src/devices/cpu/melps4/m58846.cpp
@@ -10,7 +10,7 @@
#include "m58846.h"
-const device_type M58846 = &device_creator<m58846_device>;
+const device_type M58846 = device_creator<m58846_device>;
// internal memory maps
diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp
index 307cf8d73c7..599c53bcb35 100644
--- a/src/devices/cpu/minx/minx.cpp
+++ b/src/devices/cpu/minx/minx.cpp
@@ -72,7 +72,7 @@ TODO:
#define GET_MINX_PC ( ( m_PC & 0x8000 ) ? ( m_V << 15 ) | (m_PC & 0x7FFF ) : m_PC )
-const device_type MINX = &device_creator<minx_cpu_device>;
+const device_type MINX = device_creator<minx_cpu_device>;
minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp
index d2153b7b6e1..13e6f00715f 100644
--- a/src/devices/cpu/mips/mips3.cpp
+++ b/src/devices/cpu/mips/mips3.cpp
@@ -98,22 +98,22 @@ static const uint8_t fpmode_source[4] =
#define ROPCODE(pc) direct->read_dword(pc)
-const device_type VR4300BE = &device_creator<vr4300be_device>;
-const device_type VR4300LE = &device_creator<vr4300le_device>;
-const device_type VR4310BE = &device_creator<vr4310be_device>;
-const device_type VR4310LE = &device_creator<vr4310le_device>;
-const device_type R4600BE = &device_creator<r4600be_device>;
-const device_type R4600LE = &device_creator<r4600le_device>;
-const device_type R4650BE = &device_creator<r4650be_device>;
-const device_type R4650LE = &device_creator<r4650le_device>;
-const device_type R4700BE = &device_creator<r4700be_device>;
-const device_type R4700LE = &device_creator<r4700le_device>;
-const device_type R5000BE = &device_creator<r5000be_device>;
-const device_type R5000LE = &device_creator<r5000le_device>;
-const device_type QED5271BE = &device_creator<qed5271be_device>;
-const device_type QED5271LE = &device_creator<qed5271le_device>;
-const device_type RM7000BE = &device_creator<rm7000be_device>;
-const device_type RM7000LE = &device_creator<rm7000le_device>;
+const device_type VR4300BE = device_creator<vr4300be_device>;
+const device_type VR4300LE = device_creator<vr4300le_device>;
+const device_type VR4310BE = device_creator<vr4310be_device>;
+const device_type VR4310LE = device_creator<vr4310le_device>;
+const device_type R4600BE = device_creator<r4600be_device>;
+const device_type R4600LE = device_creator<r4600le_device>;
+const device_type R4650BE = device_creator<r4650be_device>;
+const device_type R4650LE = device_creator<r4650le_device>;
+const device_type R4700BE = device_creator<r4700be_device>;
+const device_type R4700LE = device_creator<r4700le_device>;
+const device_type R5000BE = device_creator<r5000be_device>;
+const device_type R5000LE = device_creator<r5000le_device>;
+const device_type QED5271BE = device_creator<qed5271be_device>;
+const device_type QED5271LE = device_creator<qed5271le_device>;
+const device_type RM7000BE = device_creator<rm7000be_device>;
+const device_type RM7000LE = device_creator<rm7000le_device>;
// VR4300 and VR5432 have 4 fewer PFN bits, and only 32 TLB entries
diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp
index f959dd4485d..a1dbba4e008 100644
--- a/src/devices/cpu/mips/r3000.cpp
+++ b/src/devices/cpu/mips/r3000.cpp
@@ -113,11 +113,11 @@
// DEVICE INTERFACE
//**************************************************************************
-const device_type R3041 = &device_creator<r3041_device>;
-const device_type R3051 = &device_creator<r3051_device>;
-const device_type R3052 = &device_creator<r3052_device>;
-const device_type R3071 = &device_creator<r3071_device>;
-const device_type R3081 = &device_creator<r3081_device>;
+const device_type R3041 = device_creator<r3041_device>;
+const device_type R3051 = device_creator<r3051_device>;
+const device_type R3052 = device_creator<r3052_device>;
+const device_type R3071 = device_creator<r3071_device>;
+const device_type R3081 = device_creator<r3081_device>;
//-------------------------------------------------
diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp
index 77af7f4d180..634a2ff9a5c 100644
--- a/src/devices/cpu/mn10200/mn10200.cpp
+++ b/src/devices/cpu/mn10200/mn10200.cpp
@@ -36,7 +36,7 @@ enum mn10200_flag
};
-const device_type MN1020012A = &device_creator<mn1020012a_device>;
+const device_type MN1020012A = device_creator<mn1020012a_device>;
// internal memory maps
static ADDRESS_MAP_START( mn1020012a_internal_map, AS_PROGRAM, 16, mn10200_device )
diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
index c74885b445d..83c228f49f0 100644
--- a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
+++ b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
@@ -41,7 +41,7 @@ enum {
#define NANO_E_BIT (NANO_DC0_BIT + HP_NANO_DC_NO) // Extend flag
#define NANO_I_BIT (NANO_E_BIT + 1) // Interrupt flag
-const device_type HP_NANOPROCESSOR = &device_creator<hp_nanoprocessor_device>;
+const device_type HP_NANOPROCESSOR = device_creator<hp_nanoprocessor_device>;
hp_nanoprocessor_device::hp_nanoprocessor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cpu_device(mconfig , HP_NANOPROCESSOR , "HP-Nanoprocessor" , tag , owner , clock , "nanoprocessor" , __FILE__),
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp
index 1211e59bbd7..10bab677918 100644
--- a/src/devices/cpu/nec/nec.cpp
+++ b/src/devices/cpu/nec/nec.cpp
@@ -115,10 +115,10 @@ typedef uint32_t DWORD;
#include "nec.h"
#include "necpriv.h"
-const device_type V20 = &device_creator<v20_device>;
-const device_type V30 = &device_creator<v30_device>;
-const device_type V33 = &device_creator<v33_device>;
-const device_type V33A =&device_creator<v33a_device>;
+const device_type V20 = device_creator<v20_device>;
+const device_type V30 = device_creator<v30_device>;
+const device_type V33 = device_creator<v33_device>;
+const device_type V33A =device_creator<v33a_device>;
diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp
index a7abd58133e..bc1c944d34f 100644
--- a/src/devices/cpu/nec/v25.cpp
+++ b/src/devices/cpu/nec/v25.cpp
@@ -46,8 +46,8 @@ typedef uint32_t DWORD;
#include "v25priv.h"
#include "nec_common.h"
-const device_type V25 = &device_creator<v25_device>;
-const device_type V35 = &device_creator<v35_device>;
+const device_type V25 = device_creator<v25_device>;
+const device_type V35 = device_creator<v35_device>;
v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, bool is_16bit, offs_t fetch_xor, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type)
diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp
index f56974dda9e..c596d46d824 100644
--- a/src/devices/cpu/nec/v53.cpp
+++ b/src/devices/cpu/nec/v53.cpp
@@ -13,8 +13,8 @@
#include "v53.h"
-const device_type V53 = &device_creator<v53_device>;
-const device_type V53A =&device_creator<v53a_device>;
+const device_type V53 = device_creator<v53_device>;
+const device_type V53A =device_creator<v53a_device>;
WRITE8_MEMBER(v53_base_device::BSEL_w)
{
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp
index 25538e62002..bd9479038d2 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp
@@ -49,7 +49,7 @@ void patinho_feio_cpu_device::compute_effective_address(unsigned int addr){
}
}
-const device_type PATO_FEIO_CPU = &device_creator<patinho_feio_cpu_device>;
+const device_type PATO_FEIO_CPU = device_creator<patinho_feio_cpu_device>;
//Internal 4kbytes of RAM
static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device)
diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h
index 9460e49908d..d33069143f8 100644
--- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h
+++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h
@@ -1,10 +1,10 @@
// license:GPL-2.0+
// copyright-holders:Felipe Sanches
-#pragma once
-
#ifndef MAME_DEVICES_CPU_PATINHOFEIO_CPU_H
#define MAME_DEVICES_CPU_PATINHOFEIO_CPU_H
+#pragma once
+
#define MCFG_PATINHO_RC_READ_CB(_devcb) \
devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb);
#define MCFG_PATINHO_BUTTONS_READ_CB(_devcb) \
diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp
index 4f3d59f4b20..8ad561c18d8 100644
--- a/src/devices/cpu/pdp1/pdp1.cpp
+++ b/src/devices/cpu/pdp1/pdp1.cpp
@@ -377,7 +377,7 @@
#define PREVIOUS_PC ((PC & ADDRESS_EXTENSION_MASK) | ((PC-1) & BASE_ADDRESS_MASK))
-const device_type PDP1 = &device_creator<pdp1_device>;
+const device_type PDP1 = device_creator<pdp1_device>;
pdp1_device::pdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp
index 3b7e9f47546..4ceb64a0bbe 100644
--- a/src/devices/cpu/pdp1/tx0.cpp
+++ b/src/devices/cpu/pdp1/tx0.cpp
@@ -40,8 +40,8 @@
#define INCREMENT_PC_8KW (PC = (PC+1) & ADDRESS_MASK_8KW)
-const device_type TX0_8KW = &device_creator<tx0_8kw_device>;
-const device_type TX0_64KW = &device_creator<tx0_64kw_device>;
+const device_type TX0_8KW = device_creator<tx0_8kw_device>;
+const device_type TX0_64KW = device_creator<tx0_64kw_device>;
tx0_device::tx0_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, int addr_bits, int address_mask, int ir_mask)
diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp
index d158786d553..8443a699ff8 100644
--- a/src/devices/cpu/pdp8/pdp8.cpp
+++ b/src/devices/cpu/pdp8/pdp8.cpp
@@ -44,7 +44,7 @@ CPU_DISASSEMBLE( pdp8 );
#define OPR_GROUP1_VAL 0000
#define OPR_GROUP2_VAL 0400
-const device_type PDP8CPU = &device_creator<pdp8_device>;
+const device_type PDP8CPU = device_creator<pdp8_device>;
//-------------------------------------------------
// pdp8_device - constructor
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index 4f639734b5d..3c36f681915 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -76,14 +76,14 @@
#include "pic16c5x.h"
-const device_type PIC16C54 = &device_creator<pic16c54_device>;
-const device_type PIC16C55 = &device_creator<pic16c55_device>;
-const device_type PIC16C56 = &device_creator<pic16c56_device>;
-const device_type PIC16C57 = &device_creator<pic16c57_device>;
-const device_type PIC16C58 = &device_creator<pic16c58_device>;
-
-const device_type PIC1650 = &device_creator<pic1650_device>;
-const device_type PIC1655 = &device_creator<pic1655_device>;
+const device_type PIC16C54 = device_creator<pic16c54_device>;
+const device_type PIC16C55 = device_creator<pic16c55_device>;
+const device_type PIC16C56 = device_creator<pic16c56_device>;
+const device_type PIC16C57 = device_creator<pic16c57_device>;
+const device_type PIC16C58 = device_creator<pic16c58_device>;
+
+const device_type PIC1650 = device_creator<pic1650_device>;
+const device_type PIC1655 = device_creator<pic1655_device>;
/****************************************************************************
diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp
index 06d44b9ed16..9901fedc3a0 100644
--- a/src/devices/cpu/pic16c62x/pic16c62x.cpp
+++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp
@@ -57,12 +57,12 @@
#include "pic16c62x.h"
-const device_type PIC16C620 = &device_creator<pic16c620_device>;
-const device_type PIC16C620A = &device_creator<pic16c620a_device>;
-const device_type PIC16C621 = &device_creator<pic16c621_device>;
-const device_type PIC16C621A = &device_creator<pic16c621a_device>;
-const device_type PIC16C622 = &device_creator<pic16c622_device>;
-const device_type PIC16C622A = &device_creator<pic16c622a_device>;
+const device_type PIC16C620 = device_creator<pic16c620_device>;
+const device_type PIC16C620A = device_creator<pic16c620a_device>;
+const device_type PIC16C621 = device_creator<pic16c621_device>;
+const device_type PIC16C621A = device_creator<pic16c621a_device>;
+const device_type PIC16C622 = device_creator<pic16c622_device>;
+const device_type PIC16C622A = device_creator<pic16c622a_device>;
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index bcdc17ae9a1..14c9f97a710 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -195,16 +195,16 @@ static const uint8_t fcmp_cr_table_source[32] =
};
-const device_type PPC601 = &device_creator<ppc601_device>;
-const device_type PPC602 = &device_creator<ppc602_device>;
-const device_type PPC603 = &device_creator<ppc603_device>;
-const device_type PPC603E = &device_creator<ppc603e_device>;
-const device_type PPC603R = &device_creator<ppc603r_device>;
-const device_type PPC604 = &device_creator<ppc604_device>;
-const device_type MPC8240 = &device_creator<mpc8240_device>;
-const device_type PPC403GA = &device_creator<ppc403ga_device>;
-const device_type PPC403GCX = &device_creator<ppc403gcx_device>;
-const device_type PPC405GP = &device_creator<ppc405gp_device>;
+const device_type PPC601 = device_creator<ppc601_device>;
+const device_type PPC602 = device_creator<ppc602_device>;
+const device_type PPC603 = device_creator<ppc603_device>;
+const device_type PPC603E = device_creator<ppc603e_device>;
+const device_type PPC603R = device_creator<ppc603r_device>;
+const device_type PPC604 = device_creator<ppc604_device>;
+const device_type MPC8240 = device_creator<mpc8240_device>;
+const device_type PPC403GA = device_creator<ppc403ga_device>;
+const device_type PPC403GCX = device_creator<ppc403gcx_device>;
+const device_type PPC405GP = device_creator<ppc405gp_device>;
ppc_device::ppc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, uint32_t cap, uint32_t tb_divisor, address_map_constructor internal_map)
diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp
index dfef6287b72..cf7acd70a8d 100644
--- a/src/devices/cpu/pps4/pps4.cpp
+++ b/src/devices/cpu/pps4/pps4.cpp
@@ -89,8 +89,8 @@
#define LOG(x)
#endif
-const device_type PPS4 = &device_creator<pps4_device>;
-const device_type PPS4_2 = &device_creator<pps4_2_device>;
+const device_type PPS4 = device_creator<pps4_device>;
+const device_type PPS4_2 = device_creator<pps4_2_device>;
pps4_device::pps4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *file)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, file)
diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp
index 6a382689f40..44cca2aa00d 100644
--- a/src/devices/cpu/psx/dma.cpp
+++ b/src/devices/cpu/psx/dma.cpp
@@ -25,7 +25,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
}
}
-const device_type PSX_DMA = &device_creator<psxdma_device>;
+const device_type PSX_DMA = device_creator<psxdma_device>;
psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_DMA, "Sony PSX DMA", tag, owner, clock, "psxdma", __FILE__), m_ram( ), m_ramsize(0), m_dpcp(0), m_dicr(0),
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index 06f1d345ac3..a06e83866a9 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
}
}
-const device_type PSX_IRQ = &device_creator<psxirq_device>;
+const device_type PSX_IRQ = device_creator<psxirq_device>;
psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_IRQ, "Sony PSX IRQ", tag, owner, clock, "psxirq", __FILE__), n_irqdata(0), n_irqmask(0),
diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp
index c91c50d1d43..6398ecc0160 100644
--- a/src/devices/cpu/psx/mdec.cpp
+++ b/src/devices/cpu/psx/mdec.cpp
@@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
}
}
-const device_type PSX_MDEC = &device_creator<psxmdec_device>;
+const device_type PSX_MDEC = device_creator<psxmdec_device>;
psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PSX_MDEC, "Sony PSX MDEC", tag, owner, clock, "psxmdec", __FILE__), n_decoded(0), n_offset(0), n_0_command(0), n_0_address(0), n_0_size(0), n_1_command(0), n_1_status(0)
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index 839bead5b73..3eeb9914806 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -66,11 +66,12 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "psx.h"
#include "mdec.h"
#include "rcnt.h"
#include "sound/spu.h"
+#include "machine/ram.h"
+#include "debugger.h"
#define LOG_BIOSCALL ( 0 )
@@ -165,12 +166,12 @@ static const char *const delayn[] =
};
// device type definition
-const device_type CXD8530AQ = &device_creator<cxd8530aq_device>;
-const device_type CXD8530BQ = &device_creator<cxd8530bq_device>;
-const device_type CXD8530CQ = &device_creator<cxd8530cq_device>;
-const device_type CXD8661R = &device_creator<cxd8661r_device>;
-const device_type CXD8606BQ = &device_creator<cxd8606bq_device>;
-const device_type CXD8606CQ = &device_creator<cxd8606cq_device>;
+const device_type CXD8530AQ = device_creator<cxd8530aq_device>;
+const device_type CXD8530BQ = device_creator<cxd8530bq_device>;
+const device_type CXD8530CQ = device_creator<cxd8530cq_device>;
+const device_type CXD8661R = device_creator<cxd8661r_device>;
+const device_type CXD8606BQ = device_creator<cxd8606bq_device>;
+const device_type CXD8606CQ = device_creator<cxd8606cq_device>;
static const uint32_t mtc0_writemask[]=
{
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index fd210ae3220..417eecaae1a 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -7,12 +7,11 @@
*
*/
-#pragma once
+#ifndef MAME_DEVICES_CPU_PSX_PSX_H
+#define MAME_DEVICES_CPU_PSX_PSX_H
-#ifndef __PSXCPU_H__
-#define __PSXCPU_H__
+#pragma once
-#include "machine/ram.h"
#include "dma.h"
#include "gte.h"
#include "irq.h"
@@ -134,10 +133,12 @@ enum
// TYPE DEFINITIONS
//**************************************************************************
+class ram_device;
+
class psxcpu_state
{
public:
- virtual ~psxcpu_state() {};
+ virtual ~psxcpu_state() { }
virtual uint32_t pc() = 0;
virtual uint32_t delayr() = 0;
@@ -147,13 +148,9 @@ public:
// ======================> psxcpu_device
-class psxcpu_device : public cpu_device,
- psxcpu_state
+class psxcpu_device : public cpu_device, psxcpu_state
{
public:
- // construction/destruction
- virtual ~psxcpu_device() {};
-
// static configuration helpers
template<class _Object> static devcb_base &set_gpu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_read_handler.set_callback(object); }
template<class _Object> static devcb_base &set_gpu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_write_handler.set_callback(object); }
@@ -523,4 +520,4 @@ extern const device_type CXD8606CQ;
extern unsigned DasmPSXCPU(psxcpu_state *state, std::ostream &stream, uint32_t pc, const uint8_t *opram);
-#endif /* __PSXCPU_H__ */
+#endif // MAME_DEVICES_CPU_PSX_PSX_H
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index aeaf90488f9..c3b574e4c31 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -25,7 +25,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
}
}
-const device_type PSX_RCNT = &device_creator<psxrcnt_device>;
+const device_type PSX_RCNT = device_creator<psxrcnt_device>;
psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_RCNT, "Sony PSX RCNT", tag, owner, clock, "psxrcnt", __FILE__),
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index 270e44f2c2a..048ab52de88 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -25,8 +25,8 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
}
}
-const device_type PSX_SIO0 = &device_creator<psxsio0_device>;
-const device_type PSX_SIO1 = &device_creator<psxsio1_device>;
+const device_type PSX_SIO0 = device_creator<psxsio0_device>;
+const device_type PSX_SIO1 = device_creator<psxsio1_device>;
psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
psxsio_device(mconfig, PSX_SIO0, "Sony PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__)
diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp
index 2745b22ae54..30a929d50e6 100644
--- a/src/devices/cpu/rsp/rsp.cpp
+++ b/src/devices/cpu/rsp/rsp.cpp
@@ -14,7 +14,7 @@
#include "rspcp2d.h"
-const device_type RSP = &device_creator<rsp_device>;
+const device_type RSP = device_creator<rsp_device>;
#define LOG_INSTRUCTION_EXECUTION 0
diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp
index 65fe70fb13a..1eff9ebd2ff 100644
--- a/src/devices/cpu/s2650/s2650.cpp
+++ b/src/devices/cpu/s2650/s2650.cpp
@@ -26,7 +26,7 @@
#define INLINE_EA 1
-const device_type S2650 = &device_creator<s2650_device>;
+const device_type S2650 = device_creator<s2650_device>;
s2650_device::s2650_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp
index 324caee4a99..c77006fd97d 100644
--- a/src/devices/cpu/saturn/saturn.cpp
+++ b/src/devices/cpu/saturn/saturn.cpp
@@ -39,7 +39,7 @@
-const device_type SATURN = &device_creator<saturn_device>;
+const device_type SATURN = device_creator<saturn_device>;
saturn_device::saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp
index 72843013855..3d095eba8e0 100644
--- a/src/devices/cpu/sc61860/sc61860.cpp
+++ b/src/devices/cpu/sc61860/sc61860.cpp
@@ -46,7 +46,7 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type SC61860 = &device_creator<sc61860_device>;
+const device_type SC61860 = device_creator<sc61860_device>;
sc61860_device::sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp
index 49e5d737695..f04d5e01f87 100644
--- a/src/devices/cpu/scmp/scmp.cpp
+++ b/src/devices/cpu/scmp/scmp.cpp
@@ -17,8 +17,8 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type SCMP = &device_creator<scmp_device>;
-const device_type INS8060 = &device_creator<ins8060_device>;
+const device_type SCMP = device_creator<scmp_device>;
+const device_type INS8060 = device_creator<ins8060_device>;
scmp_device::scmp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp
index cafaf73eaa0..b24c7b2f941 100644
--- a/src/devices/cpu/score/score.cpp
+++ b/src/devices/cpu/score/score.cpp
@@ -16,7 +16,7 @@
// CONSTANTS
//**************************************************************************
-const device_type SCORE7 = &device_creator<score7_cpu_device>;
+const device_type SCORE7 = device_creator<score7_cpu_device>;
//**************************************************************************
diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp
index 4d608b3b8d5..2da97c8cc7f 100644
--- a/src/devices/cpu/scudsp/scudsp.cpp
+++ b/src/devices/cpu/scudsp/scudsp.cpp
@@ -95,7 +95,7 @@
#include "scudsp.h"
-const device_type SCUDSP = &device_creator<scudsp_cpu_device>;
+const device_type SCUDSP = device_creator<scudsp_cpu_device>;
/* FLAGS */
#define PRF m_flags & 0x04000000
diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp
index 32cbf4d224d..29d04d867e5 100644
--- a/src/devices/cpu/se3208/se3208.cpp
+++ b/src/devices/cpu/se3208/se3208.cpp
@@ -42,7 +42,7 @@
// are such accesses simply illegal, be handled in a different way, or simply not be happening in the first place?
#define ALLOW_UNALIGNED_DWORD_ACCESS 0
-const device_type SE3208 = &device_creator<se3208_device>;
+const device_type SE3208 = device_creator<se3208_device>;
se3208_device::se3208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp
index ad000212a13..b4a10a079cc 100644
--- a/src/devices/cpu/sh2/sh2.cpp
+++ b/src/devices/cpu/sh2/sh2.cpp
@@ -122,9 +122,9 @@
#define COMPILE_MAX_SEQUENCE 64
-const device_type SH1 = &device_creator<sh1_device>;
-const device_type SH2 = &device_creator<sh2_device>;
-const device_type SH2A = &device_creator<sh2a_device>;
+const device_type SH1 = device_creator<sh1_device>;
+const device_type SH2 = device_creator<sh2_device>;
+const device_type SH2A = device_creator<sh2a_device>;
/*-------------------------------------------------
sh2_internal_a5 - read handler for
diff --git a/src/devices/cpu/sh2/sh7604_bus.cpp b/src/devices/cpu/sh2/sh7604_bus.cpp
index 3d26c807a87..5052d4a41f1 100644
--- a/src/devices/cpu/sh2/sh7604_bus.cpp
+++ b/src/devices/cpu/sh2/sh7604_bus.cpp
@@ -23,7 +23,7 @@
//**************************************************************************
// device type definition
-const device_type SH7604_BUS = &device_creator<sh7604_bus_device>;
+const device_type SH7604_BUS = device_creator<sh7604_bus_device>;
//**************************************************************************
diff --git a/src/devices/cpu/sh2/sh7604_sci.cpp b/src/devices/cpu/sh2/sh7604_sci.cpp
index 632749f68f1..a20d3c3135a 100644
--- a/src/devices/cpu/sh2/sh7604_sci.cpp
+++ b/src/devices/cpu/sh2/sh7604_sci.cpp
@@ -22,7 +22,7 @@
//**************************************************************************
// device type definition
-const device_type SH7604_SCI = &device_creator<sh7604_sci_device>;
+const device_type SH7604_SCI = device_creator<sh7604_sci_device>;
//**************************************************************************
diff --git a/src/devices/cpu/sh2/sh7604_wdt.cpp b/src/devices/cpu/sh2/sh7604_wdt.cpp
index e128b692fa0..a396e2872f3 100644
--- a/src/devices/cpu/sh2/sh7604_wdt.cpp
+++ b/src/devices/cpu/sh2/sh7604_wdt.cpp
@@ -20,7 +20,7 @@
//**************************************************************************
// device type definition
-const device_type SH7604_WDT = &device_creator<sh7604_wdt_device>;
+const device_type SH7604_WDT = device_creator<sh7604_wdt_device>;
//**************************************************************************
diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp
index 43b0d669a42..1605d918aed 100644
--- a/src/devices/cpu/sh4/sh4.cpp
+++ b/src/devices/cpu/sh4/sh4.cpp
@@ -55,10 +55,10 @@ CPU_DISASSEMBLE( sh4 );
CPU_DISASSEMBLE( sh4be );
-const device_type SH3LE = &device_creator<sh3_device>;
-const device_type SH3BE = &device_creator<sh3be_device>;
-const device_type SH4LE = &device_creator<sh4_device>;
-const device_type SH4BE = &device_creator<sh4be_device>;
+const device_type SH3LE = device_creator<sh3_device>;
+const device_type SH3BE = device_creator<sh3be_device>;
+const device_type SH4LE = device_creator<sh4_device>;
+const device_type SH4BE = device_creator<sh4be_device>;
#if 0
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index bfca22096c2..1b49b409e00 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -52,7 +52,7 @@ enum
SHARC_B12, SHARC_B13, SHARC_B14, SHARC_B15
};
-const device_type ADSP21062 = &device_creator<adsp21062_device>;
+const device_type ADSP21062 = device_creator<adsp21062_device>;
static ADDRESS_MAP_START( internal_pgm, AS_PROGRAM, 64, adsp21062_device )
AM_RANGE(0x20000, 0x24fff) AM_READWRITE(pm0_r, pm0_w)
diff --git a/src/devices/cpu/sm510/kb1013vk1-2core.cpp b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
index 85fd4b74a81..c7c70d28001 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2core.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
@@ -11,7 +11,7 @@
#include "debugger.h"
// MCU types
-const device_type KB1013VK12 = &device_creator<kb1013vk12_device>;
+const device_type KB1013VK12 = device_creator<kb1013vk12_device>;
// internal memory maps
diff --git a/src/devices/cpu/sm510/sm500core.cpp b/src/devices/cpu/sm510/sm500core.cpp
index 5e6041831a2..d25eaf9c673 100644
--- a/src/devices/cpu/sm510/sm500core.cpp
+++ b/src/devices/cpu/sm510/sm500core.cpp
@@ -12,7 +12,7 @@
// MCU types
-const device_type SM500 = &device_creator<sm500_device>;
+const device_type SM500 = device_creator<sm500_device>;
// internal memory maps
diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp
index 323d2eb84e4..a531fc37e69 100644
--- a/src/devices/cpu/sm510/sm510core.cpp
+++ b/src/devices/cpu/sm510/sm510core.cpp
@@ -12,7 +12,7 @@
// MCU types
-const device_type SM510 = &device_creator<sm510_device>;
+const device_type SM510 = device_creator<sm510_device>;
// internal memory maps
diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp
index f71e93a968e..1c40e781764 100644
--- a/src/devices/cpu/sm510/sm511core.cpp
+++ b/src/devices/cpu/sm510/sm511core.cpp
@@ -12,8 +12,8 @@
// MCU types
-const device_type SM511 = &device_creator<sm511_device>;
-const device_type SM512 = &device_creator<sm512_device>;
+const device_type SM511 = device_creator<sm511_device>;
+const device_type SM512 = device_creator<sm512_device>;
// internal memory maps
diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp
index 90aaaaf6ed6..e6dc66e6ec5 100644
--- a/src/devices/cpu/sm8500/sm8500.cpp
+++ b/src/devices/cpu/sm8500/sm8500.cpp
@@ -24,7 +24,7 @@ they are internally.
#include "sm8500.h"
-const device_type SM8500 = &device_creator<sm8500_cpu_device>;
+const device_type SM8500 = device_creator<sm8500_cpu_device>;
static const uint8_t sm8500_b2w[8] = {
diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp
index 3fc1eca330d..69142f5e474 100644
--- a/src/devices/cpu/sparc/mb86901.cpp
+++ b/src/devices/cpu/sparc/mb86901.cpp
@@ -22,7 +22,7 @@
#include "sparc.h"
#include "sparcdefs.h"
-const device_type MB86901 = &device_creator<mb86901_device>;
+const device_type MB86901 = device_creator<mb86901_device>;
const int mb86901_device::NWINDOWS = 7;
diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp
index 1668be70617..15700512a6e 100644
--- a/src/devices/cpu/spc700/spc700.cpp
+++ b/src/devices/cpu/spc700/spc700.cpp
@@ -216,7 +216,7 @@ static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
-const device_type SPC700 = &device_creator<spc700_device>;
+const device_type SPC700 = device_creator<spc700_device>;
spc700_device::spc700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp
index c2f462a6738..92c85220bdf 100644
--- a/src/devices/cpu/ssem/ssem.cpp
+++ b/src/devices/cpu/ssem/ssem.cpp
@@ -76,7 +76,7 @@ inline void ssem_device::program_write32(uint32_t address, uint32_t data)
/*****************************************************************************/
-const device_type SSEMCPU = &device_creator<ssem_device>;
+const device_type SSEMCPU = device_creator<ssem_device>;
//-------------------------------------------------
// ssem_device - constructor
diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp
index 25005fd8701..4f000067e38 100644
--- a/src/devices/cpu/ssp1601/ssp1601.cpp
+++ b/src/devices/cpu/ssp1601/ssp1601.cpp
@@ -189,7 +189,7 @@
#endif
-const device_type SSP1601 = &device_creator<ssp1601_device>;
+const device_type SSP1601 = device_creator<ssp1601_device>;
ssp1601_device::ssp1601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp
index 7ed250b49f4..d9487630348 100644
--- a/src/devices/cpu/superfx/superfx.cpp
+++ b/src/devices/cpu/superfx/superfx.cpp
@@ -5,7 +5,7 @@
#include "superfx.h"
-const device_type SUPERFX = &device_creator<superfx_device>;
+const device_type SUPERFX = device_creator<superfx_device>;
superfx_device::superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: cpu_device(mconfig, SUPERFX, "SuperFX", tag, owner, clock, "superfx", __FILE__)
diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp
index 5c889099cd7..f02649af571 100644
--- a/src/devices/cpu/t11/t11.cpp
+++ b/src/devices/cpu/t11/t11.cpp
@@ -35,8 +35,8 @@
#define PSW m_psw.b.l
-const device_type T11 = &device_creator<t11_device>;
-const device_type K1801VM2 = &device_creator<k1801vm2_device>;
+const device_type T11 = device_creator<t11_device>;
+const device_type K1801VM2 = device_creator<k1801vm2_device>;
k1801vm2_device::k1801vm2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/tlcs870/tlcs870.cpp b/src/devices/cpu/tlcs870/tlcs870.cpp
index f8e47f28e81..440b8108ccf 100644
--- a/src/devices/cpu/tlcs870/tlcs870.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870.cpp
@@ -96,7 +96,7 @@ static const char *const reg16p[] = {
-const device_type TMP87PH40AN = &device_creator<tmp87ph40an_device>;
+const device_type TMP87PH40AN = device_creator<tmp87ph40an_device>;
static ADDRESS_MAP_START(tmp87ph40an_mem, AS_PROGRAM, 8, tlcs870_device)
#if 0
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index f7e81101c98..973b29579bf 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -21,11 +21,11 @@ static const char *const op_names[] = { "??", "nop", "ex", "exx",
ALLOW_SAVE_TYPE(tlcs90_device::e_mode); // allow save_item on a non-fundamental type
-const device_type TMP90840 = &device_creator<tmp90840_device>;
-const device_type TMP90841 = &device_creator<tmp90841_device>;
-const device_type TMP90845 = &device_creator<tmp90845_device>;
-const device_type TMP91640 = &device_creator<tmp91640_device>;
-const device_type TMP91641 = &device_creator<tmp91641_device>;
+const device_type TMP90840 = device_creator<tmp90840_device>;
+const device_type TMP90841 = device_creator<tmp90841_device>;
+const device_type TMP90845 = device_creator<tmp90845_device>;
+const device_type TMP91640 = device_creator<tmp91640_device>;
+const device_type TMP91641 = device_creator<tmp91641_device>;
static ADDRESS_MAP_START(tmp90840_mem, AS_PROGRAM, 8, tlcs90_device)
diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp
index 9b87d5f54b4..96031d0637e 100644
--- a/src/devices/cpu/tlcs900/tlcs900.cpp
+++ b/src/devices/cpu/tlcs900/tlcs900.cpp
@@ -20,8 +20,8 @@ TODO:
#include "tlcs900.h"
-const device_type TMP95C061 = &device_creator<tmp95c061_device>;
-const device_type TMP95C063 = &device_creator<tmp95c063_device>;
+const device_type TMP95C061 = device_creator<tmp95c061_device>;
+const device_type TMP95C063 = device_creator<tmp95c063_device>;
static ADDRESS_MAP_START( tmp95c061_mem8, AS_PROGRAM, 8, tmp95c061_device )
diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp
index 48d6aa516d0..c7dec0f2544 100644
--- a/src/devices/cpu/tms1000/tms0270.cpp
+++ b/src/devices/cpu/tms1000/tms0270.cpp
@@ -15,7 +15,7 @@
// - 64-term microinstructions PLA between the RAM and ROM, similar to TMS0980,
// plus optional separate lines for custom opcode handling
// - 48-term output PLA above the RAM (rotate opla 90 degrees)
-const device_type TMS0270 = &device_creator<tms0270_cpu_device>; // 40-pin DIP, 16 O pins, 8+ R pins (some R pins are internally hooked up to support more I/O)
+const device_type TMS0270 = device_creator<tms0270_cpu_device>; // 40-pin DIP, 16 O pins, 8+ R pins (some R pins are internally hooked up to support more I/O)
// newer TMS0270 chips (eg. Speak & Math) have 42 pins
// TMS0260 is same or similar?
diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp
index 6bf398272e0..c4fbd7618df 100644
--- a/src/devices/cpu/tms1000/tms0970.cpp
+++ b/src/devices/cpu/tms1000/tms0970.cpp
@@ -13,7 +13,7 @@
// TMS0950 is a TMS1000 with a TMS0980 style opla, it was quickly succeeded by the TMS0970
// - RAM, ROM, microinstructions is the same as TMS1000
// - 10-term inverted output PLA and segment PLA on the top-left
-const device_type TMS0950 = &device_creator<tms0950_cpu_device>; // 28-pin DIP, 8 O pins, 11? R pins
+const device_type TMS0950 = device_creator<tms0950_cpu_device>; // 28-pin DIP, 8 O pins, 11? R pins
// TMS0970 is a stripped-down version of the TMS0980, itself acting more like a TMS1000
// - RAM and ROM is the same as TMS1000
@@ -22,8 +22,8 @@ const device_type TMS0950 = &device_creator<tms0950_cpu_device>; // 28-pin DIP,
// RETN, SETR, RBIT, SBIT, LDX, COMX, TDO, ..., redir(----0-00), LDP
// - 32-term microinstructions PLA between the RAM and ROM, supporting 15 microinstructions
// - 16-term inverted output PLA and segment PLA above the RAM (rotate opla 90 degrees)
-const device_type TMS0970 = &device_creator<tms0970_cpu_device>; // 28-pin DIP, 11 R pins (note: pinout may slightly differ from chip to chip)
-const device_type TMS1990 = &device_creator<tms1990_cpu_device>; // 28-pin DIP, ? R pins..
+const device_type TMS0970 = device_creator<tms0970_cpu_device>; // 28-pin DIP, 11 R pins (note: pinout may slightly differ from chip to chip)
+const device_type TMS1990 = device_creator<tms1990_cpu_device>; // 28-pin DIP, ? R pins..
// internal memory maps
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp
index 0057db927a2..b9bef8d3cf8 100644
--- a/src/devices/cpu/tms1000/tms0980.cpp
+++ b/src/devices/cpu/tms1000/tms0980.cpp
@@ -20,13 +20,13 @@
// TDO, SBIT, RETN, SETR, REAC, XDA, SAL, RBIT, ..., OFF, SBL, LDP, redir(------00- + R0^BL)
// - 64-term microinstructions PLA between the RAM and ROM, supporting 20 microinstructions
// - 16-term inverted output PLA and segment PLA above the RAM (rotate opla 90 degrees)
-const device_type TMS0980 = &device_creator<tms0980_cpu_device>; // 28-pin DIP, 9 R pins
+const device_type TMS0980 = device_creator<tms0980_cpu_device>; // 28-pin DIP, 9 R pins
// TMS1980 is a TMS0980 with a TMS1x00 style opla
// - RAM, ROM, and main instructions PLAs is the same as TMS0980
// - one of the microinstructions redirects to a RSTR instruction, like on TMS0270
// - 32-term inverted output PLA above the RAM, 7 bits! (rotate opla 270 degrees)
-const device_type TMS1980 = &device_creator<tms1980_cpu_device>; // 28-pin DIP, 7 O pins, 10 R pins, high voltage
+const device_type TMS1980 = device_creator<tms1980_cpu_device>; // 28-pin DIP, 7 O pins, 10 R pins, high voltage
// internal memory maps
diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index 2f97dedd360..a1b543a846c 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -19,13 +19,13 @@
// - 30-term microinstructions PLA(mpla) at the top half, to the right of the midline, supporting 16 microinstructions
// - 20-term output PLA(opla) at the top-left
// - the ALU is between the opla and mpla
-const device_type TMS1000 = &device_creator<tms1000_cpu_device>; // 28-pin DIP, 11 R pins
-const device_type TMS1070 = &device_creator<tms1070_cpu_device>; // high voltage version
-const device_type TMS1040 = &device_creator<tms1040_cpu_device>; // same as TMS1070 with just a different pinout?
-const device_type TMS1200 = &device_creator<tms1200_cpu_device>; // 40-pin DIP, 13 R pins
+const device_type TMS1000 = device_creator<tms1000_cpu_device>; // 28-pin DIP, 11 R pins
+const device_type TMS1070 = device_creator<tms1070_cpu_device>; // high voltage version
+const device_type TMS1040 = device_creator<tms1040_cpu_device>; // same as TMS1070 with just a different pinout?
+const device_type TMS1200 = device_creator<tms1200_cpu_device>; // 40-pin DIP, 13 R pins
// TMS1270 has 10 O pins, how does that work?
-const device_type TMS1700 = &device_creator<tms1700_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
-const device_type TMS1730 = &device_creator<tms1730_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused)
+const device_type TMS1700 = device_creator<tms1700_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
+const device_type TMS1730 = device_creator<tms1730_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused)
// internal memory maps
diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp
index a49469aa920..781998ffc07 100644
--- a/src/devices/cpu/tms1000/tms1100.cpp
+++ b/src/devices/cpu/tms1000/tms1100.cpp
@@ -11,10 +11,10 @@
#include "debugger.h"
// TMS1100 is nearly the same as TMS1000, some different opcodes, and with double the RAM and ROM
-const device_type TMS1100 = &device_creator<tms1100_cpu_device>; // 28-pin DIP, 11 R pins
-const device_type TMS1170 = &device_creator<tms1170_cpu_device>; // high voltage version
-const device_type TMS1300 = &device_creator<tms1300_cpu_device>; // 40-pin DIP, 16 R pins
-const device_type TMS1370 = &device_creator<tms1370_cpu_device>; // high voltage version
+const device_type TMS1100 = device_creator<tms1100_cpu_device>; // 28-pin DIP, 11 R pins
+const device_type TMS1170 = device_creator<tms1170_cpu_device>; // high voltage version
+const device_type TMS1300 = device_creator<tms1300_cpu_device>; // 40-pin DIP, 16 R pins
+const device_type TMS1370 = device_creator<tms1370_cpu_device>; // high voltage version
// internal memory maps
diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp
index ece13f4968e..46b0271c54c 100644
--- a/src/devices/cpu/tms1000/tms1400.cpp
+++ b/src/devices/cpu/tms1000/tms1400.cpp
@@ -16,14 +16,14 @@
// TMS1400 follows the TMS1100, it doubles the ROM size again (4 chapters of 16 pages), and adds a 3-level callstack
// - rotate the view and mirror the OR-mask to get the proper layout of the mpla, the default is identical to tms1100
// - the opla size is increased from 20 to 32 terms
-const device_type TMS1400 = &device_creator<tms1400_cpu_device>; // 28-pin DIP, 11 R pins (TMS1400CR is same, but with TMS1100 pinout)
-const device_type TMS1470 = &device_creator<tms1470_cpu_device>; // high voltage version, 1 R pin removed for Vdd
+const device_type TMS1400 = device_creator<tms1400_cpu_device>; // 28-pin DIP, 11 R pins (TMS1400CR is same, but with TMS1100 pinout)
+const device_type TMS1470 = device_creator<tms1470_cpu_device>; // high voltage version, 1 R pin removed for Vdd
// TMS1600 adds more I/O to the TMS1400, input pins are doubled with added L1,2,4,8
// - rotate the view and mirror the OR-mask to get the proper layout of the mpla, the default is identical to tms1100
// - the opla size is increased from 20 to 32 terms
-const device_type TMS1600 = &device_creator<tms1600_cpu_device>; // 40-pin DIP, 16 R pins
-const device_type TMS1670 = &device_creator<tms1670_cpu_device>; // high voltage version
+const device_type TMS1600 = device_creator<tms1600_cpu_device>; // 40-pin DIP, 16 R pins
+const device_type TMS1670 = device_creator<tms1670_cpu_device>; // high voltage version
// internal memory maps
diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp
index f6b162ca728..c5118781499 100644
--- a/src/devices/cpu/tms1000/tp0320.cpp
+++ b/src/devices/cpu/tms1000/tp0320.cpp
@@ -22,7 +22,7 @@
// - 64-term microinstructions PLA between the RAM and ROM, similar to TMS0980,
// plus separate lines for custom opcode handling like TMS0270, used for SETR and RSTR
// - 24-term output PLA above LCD RAM
-const device_type TP0320 = &device_creator<tp0320_cpu_device>; // 28-pin SDIP, ..
+const device_type TP0320 = device_creator<tp0320_cpu_device>; // 28-pin SDIP, ..
// internal memory maps
diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp
index 76d178b5c73..19e9efb8e2b 100644
--- a/src/devices/cpu/tms32010/tms32010.cpp
+++ b/src/devices/cpu/tms32010/tms32010.cpp
@@ -73,9 +73,9 @@
#define P_OUT(A,V) TMS32010_Out(A,V)
-const device_type TMS32010 = &device_creator<tms32010_device>;
-const device_type TMS32015 = &device_creator<tms32015_device>;
-const device_type TMS32016 = &device_creator<tms32016_device>;
+const device_type TMS32010 = device_creator<tms32010_device>;
+const device_type TMS32015 = device_creator<tms32015_device>;
+const device_type TMS32016 = device_creator<tms32016_device>;
/****************************************************************************
diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp
index 5abbd29aa96..3bc8d77938e 100644
--- a/src/devices/cpu/tms32025/tms32025.cpp
+++ b/src/devices/cpu/tms32025/tms32025.cpp
@@ -183,8 +183,8 @@ Table 3-2. TMS32025/26 Memory Blocks
#define IND m_AR[ARP] /* address used in indirect memory access operations */
-const device_type TMS32025 = &device_creator<tms32025_device>;
-const device_type TMS32026 = &device_creator<tms32026_device>;
+const device_type TMS32025 = device_creator<tms32025_device>;
+const device_type TMS32026 = device_creator<tms32026_device>;
static ADDRESS_MAP_START( tms32025_data, AS_DATA, 16, tms32025_device )
AM_RANGE(0x0000, 0x0000) AM_READWRITE(drr_r, drr_w)
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index 6f957b685f5..58cbccdebf5 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -87,8 +87,8 @@ const int GIEFLAG = 0x2000;
//**************************************************************************
// device type definition
-const device_type TMS32031 = &device_creator<tms32031_device>;
-const device_type TMS32032 = &device_creator<tms32032_device>;
+const device_type TMS32031 = device_creator<tms32031_device>;
+const device_type TMS32032 = device_creator<tms32032_device>;
// internal memory maps
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index fee1df7fdc8..54c53659b61 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -46,8 +46,8 @@ enum
};
-const device_type TMS32051 = &device_creator<tms32051_device>;
-const device_type TMS32053 = &device_creator<tms32053_device>;
+const device_type TMS32051 = device_creator<tms32051_device>;
+const device_type TMS32053 = device_creator<tms32053_device>;
/**************************************************************************
diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp
index 1540fdc03a2..de23e2f7736 100644
--- a/src/devices/cpu/tms32082/tms32082.cpp
+++ b/src/devices/cpu/tms32082/tms32082.cpp
@@ -14,8 +14,8 @@
extern CPU_DISASSEMBLE(tms32082_mp);
extern CPU_DISASSEMBLE(tms32082_pp);
-const device_type TMS32082_MP = &device_creator<tms32082_mp_device>;
-const device_type TMS32082_PP = &device_creator<tms32082_pp_device>;
+const device_type TMS32082_MP = device_creator<tms32082_mp_device>;
+const device_type TMS32082_PP = device_creator<tms32082_pp_device>;
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index 23b181147a6..cf2de1129c0 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -10,9 +10,11 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "tms34010.h"
+#include "debugger.h"
+#include "screen.h"
+
/***************************************************************************
DEBUG STATE & STRUCTURES
@@ -25,8 +27,8 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type TMS34010 = &device_creator<tms34010_device>;
-const device_type TMS34020 = &device_creator<tms34020_device>;
+const device_type TMS34010 = device_creator<tms34010_device>;
+const device_type TMS34020 = device_creator<tms34020_device>;
/***************************************************************************
diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp
index e39b7766107..88e49847b80 100644
--- a/src/devices/cpu/tms57002/tms57002.cpp
+++ b/src/devices/cpu/tms57002/tms57002.cpp
@@ -13,7 +13,7 @@
#include "debugger.h"
#include "tms57002.h"
-const device_type TMS57002 = &device_creator<tms57002_device>;
+const device_type TMS57002 = device_creator<tms57002_device>;
// Can't use a DEVICE_ADDRESS_MAP, not yet anyway
static ADDRESS_MAP_START(internal_pgm, AS_PROGRAM, 32, tms57002_device)
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index a064d0fc9ad..e0069300f6d 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -22,29 +22,29 @@
// TMS7000 is the most basic one, 128 bytes internal RAM and no internal ROM.
// TMS7020 and TMS7040 are same, but with 2KB and 4KB internal ROM respectively.
-const device_type TMS7000 = &device_creator<tms7000_device>;
-const device_type TMS7020 = &device_creator<tms7020_device>;
-const device_type TMS7040 = &device_creator<tms7040_device>;
+const device_type TMS7000 = device_creator<tms7000_device>;
+const device_type TMS7020 = device_creator<tms7020_device>;
+const device_type TMS7040 = device_creator<tms7040_device>;
// Exelvision (spinoff of TI) TMS7020 added one custom opcode.
-const device_type TMS7020_EXL = &device_creator<tms7020_exl_device>;
+const device_type TMS7020_EXL = device_creator<tms7020_exl_device>;
// CMOS devices biggest difference in a 'real world' setting is that the power
// requirements are much lower. This obviously has no use in software emulation.
-const device_type TMS70C00 = &device_creator<tms70c00_device>;
-const device_type TMS70C20 = &device_creator<tms70c20_device>;
-const device_type TMS70C40 = &device_creator<tms70c40_device>;
+const device_type TMS70C00 = device_creator<tms70c00_device>;
+const device_type TMS70C20 = device_creator<tms70c20_device>;
+const device_type TMS70C40 = device_creator<tms70c40_device>;
// TMS70x1 features more peripheral I/O, the main addition being a serial port.
// TMS70x2 is the same, just with twice more RAM (256 bytes)
-const device_type TMS7001 = &device_creator<tms7001_device>;
-const device_type TMS7041 = &device_creator<tms7041_device>;
-const device_type TMS7002 = &device_creator<tms7002_device>;
-const device_type TMS7042 = &device_creator<tms7042_device>;
+const device_type TMS7001 = device_creator<tms7001_device>;
+const device_type TMS7041 = device_creator<tms7041_device>;
+const device_type TMS7002 = device_creator<tms7002_device>;
+const device_type TMS7042 = device_creator<tms7042_device>;
// TMS70C46 is literally a shell around a TMS70C40, with support for external
// memory bus, auto external clock divider on slow memory, and wake-up on keypress.
-const device_type TMS70C46 = &device_creator<tms70c46_device>;
+const device_type TMS70C46 = device_creator<tms70c46_device>;
// TMS70Cx2 is an update to TMS70x2 with some extra features. Due to some changes
// in peripheral file I/O, it is not backward compatible to TMS70x2.
diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp
index 586f8bee8c9..9fafeb11563 100644
--- a/src/devices/cpu/tms9900/ti990_10.cpp
+++ b/src/devices/cpu/tms9900/ti990_10.cpp
@@ -147,4 +147,4 @@ offs_t ti990_10_device::disasm_disassemble(std::ostream &stream, offs_t pc, cons
return CPU_DISASSEMBLE_NAME(tms9900)(this, stream, pc, oprom, opram, options);
}
-const device_type TI990_10 = &device_creator<ti990_10_device>;
+const device_type TI990_10 = device_creator<ti990_10_device>;
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index 5181d9cd1c7..4b057b8f4f7 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -2777,4 +2777,4 @@ offs_t tms99xx_device::disasm_disassemble(std::ostream &stream, offs_t pc, const
}
-const device_type TMS9900 = &device_creator<tms9900_device>;
+const device_type TMS9900 = device_creator<tms9900_device>;
diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp
index 46c76797d81..54459206715 100644
--- a/src/devices/cpu/tms9900/tms9980a.cpp
+++ b/src/devices/cpu/tms9900/tms9980a.cpp
@@ -298,4 +298,4 @@ offs_t tms9980a_device::disasm_disassemble(std::ostream &stream, offs_t pc, cons
return CPU_DISASSEMBLE_NAME(tms9980)(this, stream, pc, oprom, opram, options);
}
-const device_type TMS9980A = &device_creator<tms9980a_device>;
+const device_type TMS9980A = device_creator<tms9980a_device>;
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index ec12a230276..556dfb09694 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -3556,5 +3556,5 @@ offs_t tms9995_device::disasm_disassemble(std::ostream &stream, offs_t pc, const
}
-const device_type TMS9995 = &device_creator<tms9995_device>;
-const device_type TMS9995_MP9537 = &device_creator<tms9995_mp9537_device>;
+const device_type TMS9995 = device_creator<tms9995_device>;
+const device_type TMS9995_MP9537 = device_creator<tms9995_mp9537_device>;
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index 3d2b164672f..551b2d437e6 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -26,12 +26,12 @@
// uCOM-43 products: 2000x8 ROM, RAM size custom, supports full instruction set
-const device_type NEC_D553 = &device_creator<upd553_cpu_device>; // 42-pin PMOS, 35 pins for I/O, Open Drain output, 96x4 RAM
-const device_type NEC_D557L = &device_creator<upd557l_cpu_device>; // 28-pin PMOS, 21 pins for I/O, Open Drain output, 96x4 RAM
-const device_type NEC_D650 = &device_creator<upd650_cpu_device>; // 42-pin CMOS, 35 pins for I/O, push-pull output, 96x4 RAM
+const device_type NEC_D553 = device_creator<upd553_cpu_device>; // 42-pin PMOS, 35 pins for I/O, Open Drain output, 96x4 RAM
+const device_type NEC_D557L = device_creator<upd557l_cpu_device>; // 28-pin PMOS, 21 pins for I/O, Open Drain output, 96x4 RAM
+const device_type NEC_D650 = device_creator<upd650_cpu_device>; // 42-pin CMOS, 35 pins for I/O, push-pull output, 96x4 RAM
// uCOM-44 products: 1000x8 ROM, 64x4 RAM, does not support external interrupt
-const device_type NEC_D552 = &device_creator<upd552_cpu_device>; // 42-pin PMOS, 35 pins for I/O, Open Drain output
+const device_type NEC_D552 = device_creator<upd552_cpu_device>; // 42-pin PMOS, 35 pins for I/O, Open Drain output
// uCOM-45 products: ROM size custom, 32x4 RAM
//..
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp
index 1d40ba330ee..e33ec57d580 100644
--- a/src/devices/cpu/unsp/unsp.cpp
+++ b/src/devices/cpu/unsp/unsp.cpp
@@ -13,7 +13,7 @@
#include "unsp.h"
-const device_type UNSP = &device_creator<unsp_device>;
+const device_type UNSP = device_creator<unsp_device>;
unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp
index d50ff1762c3..2b8ce34595b 100644
--- a/src/devices/cpu/upd7725/upd7725.cpp
+++ b/src/devices/cpu/upd7725/upd7725.cpp
@@ -21,8 +21,8 @@
//**************************************************************************
// device type definition
-const device_type UPD7725 = &device_creator<upd7725_device>;
-const device_type UPD96050 = &device_creator<upd96050_device>;
+const device_type UPD7725 = device_creator<upd7725_device>;
+const device_type UPD96050 = device_creator<upd96050_device>;
necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t abits, uint32_t dbits, const char *name, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp
index 4f78ad642a0..888e90824fb 100644
--- a/src/devices/cpu/upd7810/upd7810.cpp
+++ b/src/devices/cpu/upd7810/upd7810.cpp
@@ -374,11 +374,11 @@ STOP 01001000 10111011 12 stop
#include "upd7810_macros.h"
-const device_type UPD7810 = &device_creator<upd7810_device>;
-const device_type UPD7807 = &device_creator<upd7807_device>;
-const device_type UPD7801 = &device_creator<upd7801_device>;
-const device_type UPD78C05 = &device_creator<upd78c05_device>;
-const device_type UPD78C06 = &device_creator<upd78c06_device>;
+const device_type UPD7810 = device_creator<upd7810_device>;
+const device_type UPD7807 = device_creator<upd7807_device>;
+const device_type UPD7801 = device_creator<upd7801_device>;
+const device_type UPD78C05 = device_creator<upd78c05_device>;
+const device_type UPD78C06 = device_creator<upd78c06_device>;
upd7810_device::upd7810_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)
diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp
index 6781756a58c..ca4ca40a0f7 100644
--- a/src/devices/cpu/v30mz/v30mz.cpp
+++ b/src/devices/cpu/v30mz/v30mz.cpp
@@ -94,7 +94,7 @@ enum BREGS {
/***************************************************************************/
-const device_type V30MZ = &device_creator<v30mz_cpu_device>;
+const device_type V30MZ = device_creator<v30mz_cpu_device>;
v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 8fee43ffa58..1d0bf2641ae 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -77,8 +77,8 @@ Package: 132-pin PGA, 200-pin QFP
#include "debugger.h"
#include "v60.h"
-const device_type V60 = &device_creator<v60_device>;
-const device_type V70 = &device_creator<v70_device>;
+const device_type V60 = device_creator<v60_device>;
+const device_type V70 = device_creator<v70_device>;
v60_device::v60_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp
index 4243aab92ab..a9d5fe08053 100644
--- a/src/devices/cpu/v810/v810.cpp
+++ b/src/devices/cpu/v810/v810.cpp
@@ -35,7 +35,7 @@
#define clkMEM 3
-const device_type V810 = &device_creator<v810_device>;
+const device_type V810 = device_creator<v810_device>;
v810_device::v810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index a9ba848ebdd..1c7d58dff75 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -78,7 +78,7 @@ Hitachi HD647180 series:
/* register is calculated as follows: refresh=(Regs.R&127)|(Regs.R2&128) */
/****************************************************************************/
-const device_type Z180 = &device_creator<z180_device>;
+const device_type Z180 = device_creator<z180_device>;
z180_device::z180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index 19e27a4070c..d29a5d9f081 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -152,9 +152,9 @@ enum
#define PRE1 m_r[Z8_REGISTER_PRE1]
-const device_type Z8601 = &device_creator<z8601_device>;
-const device_type UB8830D = &device_creator<ub8830d_device>;
-const device_type Z8611 = &device_creator<z8611_device>;
+const device_type Z8601 = device_creator<z8601_device>;
+const device_type UB8830D = device_creator<ub8830d_device>;
+const device_type Z8611 = device_creator<z8611_device>;
/***************************************************************************
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index fcf8f577a27..6a16ca22bf6 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -16,7 +16,7 @@
#include "emu.h"
#include "kl5c80a12.h"
-const device_type KL5C80A12 = &device_creator<kl5c80a12_device>;
+const device_type KL5C80A12 = device_creator<kl5c80a12_device>;
kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 2ae617f502d..2f24b48ab2d 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -13,7 +13,7 @@
#include "emu.h"
#include "tmpz84c011.h"
-const device_type TMPZ84C011 = &device_creator<tmpz84c011_device>;
+const device_type TMPZ84C011 = device_creator<tmpz84c011_device>;
static ADDRESS_MAP_START( tmpz84c011_internal_io_map, AS_IO, 8, tmpz84c011_device )
AM_RANGE(0x10, 0x13) AM_MIRROR(0xff00) AM_DEVREADWRITE("tmpz84c011_ctc", z80ctc_device, read, write)
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index b00a7013b5d..27021fc596e 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -15,7 +15,7 @@
#include "emu.h"
#include "tmpz84c015.h"
-const device_type TMPZ84C015 = &device_creator<tmpz84c015_device>;
+const device_type TMPZ84C015 = device_creator<tmpz84c015_device>;
static ADDRESS_MAP_START( tmpz84c015_internal_io_map, AS_IO, 8, tmpz84c015_device )
AM_RANGE(0x10, 0x13) AM_MIRROR(0xff00) AM_DEVREADWRITE("tmpz84c015_ctc", z80ctc_device, read, write)
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index cb0848bda9c..fcfbcb264e0 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -3724,11 +3724,11 @@ const address_space_config *z80_device::memory_space_config(address_spacenum spa
}
}
-const device_type Z80 = &device_creator<z80_device>;
+const device_type Z80 = device_creator<z80_device>;
nsc800_device::nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z80_device(mconfig, NSC800, "NSC800", tag, owner, clock, "nsc800", __FILE__)
{
}
-const device_type NSC800 = &device_creator<nsc800_device>;
+const device_type NSC800 = device_creator<nsc800_device>;
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index be15136f4ff..f513233b792 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -28,8 +28,8 @@ extern int z8k_segm_mode;
#include "z8000cpu.h"
-const device_type Z8001 = &device_creator<z8001_device>;
-const device_type Z8002 = &device_creator<z8002_device>;
+const device_type Z8001 = device_creator<z8001_device>;
+const device_type Z8002 = device_creator<z8002_device>;
z8002_device::z8002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/imagedev/bitbngr.cpp b/src/devices/imagedev/bitbngr.cpp
index eb56d7251f8..40cd8f70306 100644
--- a/src/devices/imagedev/bitbngr.cpp
+++ b/src/devices/imagedev/bitbngr.cpp
@@ -15,7 +15,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type BITBANGER = &device_creator<bitbanger_device>;
+const device_type BITBANGER = device_creator<bitbanger_device>;
/*-------------------------------------------------
ctor
diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp
index c89faa1cc06..c8123157e97 100644
--- a/src/devices/imagedev/cassette.cpp
+++ b/src/devices/imagedev/cassette.cpp
@@ -17,7 +17,7 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
// device type definition
-const device_type CASSETTE = &device_creator<cassette_image_device>;
+const device_type CASSETTE = device_creator<cassette_image_device>;
//-------------------------------------------------
// cassette_image_device - constructor
diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h
index 4a98dc3b61a..899f9078dcd 100644
--- a/src/devices/imagedev/cassette.h
+++ b/src/devices/imagedev/cassette.h
@@ -120,7 +120,7 @@ private:
extern const device_type CASSETTE;
// device iterator
-typedef device_type_iterator<&device_creator<cassette_image_device>, cassette_image_device> cassette_device_iterator;
+typedef device_type_iterator<CASSETTE, cassette_image_device> cassette_device_iterator;
/***************************************************************************
DEVICE CONFIGURATION MACROS
diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp
index 166fdf7945c..0c1c054b4a8 100644
--- a/src/devices/imagedev/chd_cd.cpp
+++ b/src/devices/imagedev/chd_cd.cpp
@@ -13,7 +13,7 @@
#include "chd_cd.h"
// device type definition
-const device_type CDROM = &device_creator<cdrom_image_device>;
+const device_type CDROM = device_creator<cdrom_image_device>;
//-------------------------------------------------
// cdrom_image_device - constructor
diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp
index 5852da4a58e..07a66bd68de 100644
--- a/src/devices/imagedev/diablo.cpp
+++ b/src/devices/imagedev/diablo.cpp
@@ -23,7 +23,7 @@ static const char *dsk_option_spec =
// device type definition
-const device_type DIABLO = &device_creator<diablo_image_device>;
+const device_type DIABLO = device_creator<diablo_image_device>;
//-------------------------------------------------
// diablo_image_device - constructor
diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp
index ad0884d3379..e7b77dd4b72 100644
--- a/src/devices/imagedev/flopdrv.cpp
+++ b/src/devices/imagedev/flopdrv.cpp
@@ -690,7 +690,7 @@ READ_LINE_MEMBER( legacy_floppy_image_device::floppy_ready_r )
}
// device type definition
-const device_type LEGACY_FLOPPY = &device_creator<legacy_floppy_image_device>;
+const device_type LEGACY_FLOPPY = device_creator<legacy_floppy_image_device>;
//-------------------------------------------------
// legacy_floppy_image_device - constructor
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 2e9b4e4d931..b4f9d88bfff 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -7,9 +7,11 @@
*********************************************************************/
#include "emu.h"
-#include "zippath.h"
#include "floppy.h"
+
+#include "speaker.cpp"
#include "formats/imageutl.h"
+#include "zippath.h"
/*
Debugging flags. Set to 0 or 1.
@@ -24,94 +26,94 @@
#define FLOPSND_TAG "floppysound"
// device type definition
-const device_type FLOPPY_CONNECTOR = &device_creator<floppy_connector>;
+const device_type FLOPPY_CONNECTOR = device_creator<floppy_connector>;
// generic 3" drives
-const device_type FLOPPY_3_SSDD = &device_creator<floppy_3_ssdd>;
-const device_type FLOPPY_3_DSDD = &device_creator<floppy_3_dsdd>;
+const device_type FLOPPY_3_SSDD = device_creator<floppy_3_ssdd>;
+const device_type FLOPPY_3_DSDD = device_creator<floppy_3_dsdd>;
// generic 3.5" drives
-const device_type FLOPPY_35_SSDD = &device_creator<floppy_35_ssdd>;
-const device_type FLOPPY_35_DD = &device_creator<floppy_35_dd>;
-const device_type FLOPPY_35_HD = &device_creator<floppy_35_hd>;
-const device_type FLOPPY_35_ED = &device_creator<floppy_35_ed>;
+const device_type FLOPPY_35_SSDD = device_creator<floppy_35_ssdd>;
+const device_type FLOPPY_35_DD = device_creator<floppy_35_dd>;
+const device_type FLOPPY_35_HD = device_creator<floppy_35_hd>;
+const device_type FLOPPY_35_ED = device_creator<floppy_35_ed>;
// generic 5.25" drives
-const device_type FLOPPY_525_SSSD_35T = &device_creator<floppy_525_sssd_35t>;
-const device_type FLOPPY_525_SD_35T = &device_creator<floppy_525_sd_35t>;
-const device_type FLOPPY_525_SSSD = &device_creator<floppy_525_sssd>;
-const device_type FLOPPY_525_SD = &device_creator<floppy_525_sd>;
-const device_type FLOPPY_525_SSDD = &device_creator<floppy_525_ssdd>;
-const device_type FLOPPY_525_DD = &device_creator<floppy_525_dd>;
-const device_type FLOPPY_525_SSQD = &device_creator<floppy_525_ssqd>;
-const device_type FLOPPY_525_QD = &device_creator<floppy_525_qd>;
-const device_type FLOPPY_525_HD = &device_creator<floppy_525_hd>;
+const device_type FLOPPY_525_SSSD_35T = device_creator<floppy_525_sssd_35t>;
+const device_type FLOPPY_525_SD_35T = device_creator<floppy_525_sd_35t>;
+const device_type FLOPPY_525_SSSD = device_creator<floppy_525_sssd>;
+const device_type FLOPPY_525_SD = device_creator<floppy_525_sd>;
+const device_type FLOPPY_525_SSDD = device_creator<floppy_525_ssdd>;
+const device_type FLOPPY_525_DD = device_creator<floppy_525_dd>;
+const device_type FLOPPY_525_SSQD = device_creator<floppy_525_ssqd>;
+const device_type FLOPPY_525_QD = device_creator<floppy_525_qd>;
+const device_type FLOPPY_525_HD = device_creator<floppy_525_hd>;
// generic 8" drives
-const device_type FLOPPY_8_SSSD = &device_creator<floppy_8_sssd>;
-const device_type FLOPPY_8_DSSD = &device_creator<floppy_8_dssd>;
-const device_type FLOPPY_8_SSDD = &device_creator<floppy_8_ssdd>;
-const device_type FLOPPY_8_DSDD = &device_creator<floppy_8_dsdd>;
+const device_type FLOPPY_8_SSSD = device_creator<floppy_8_sssd>;
+const device_type FLOPPY_8_DSSD = device_creator<floppy_8_dssd>;
+const device_type FLOPPY_8_SSDD = device_creator<floppy_8_ssdd>;
+const device_type FLOPPY_8_DSDD = device_creator<floppy_8_dsdd>;
// Epson 3.5" drives
#if 0
-const device_type EPSON_SMD_110 = &device_creator<epson_smd_110>;
-const device_type EPSON_SMD_120 = &device_creator<epson_smd_120>;
-const device_type EPSON_SMD_125 = &device_creator<epson_smd_125>;
-const device_type EPSON_SMD_130 = &device_creator<epson_smd_130>;
-const device_type EPSON_SMD_140 = &device_creator<epson_smd_140>;
-const device_type EPSON_SMD_150 = &device_creator<epson_smd_150>;
-const device_type EPSON_SMD_160 = &device_creator<epson_smd_160>;
+const device_type EPSON_SMD_110 = device_creator<epson_smd_110>;
+const device_type EPSON_SMD_120 = device_creator<epson_smd_120>;
+const device_type EPSON_SMD_125 = device_creator<epson_smd_125>;
+const device_type EPSON_SMD_130 = device_creator<epson_smd_130>;
+const device_type EPSON_SMD_140 = device_creator<epson_smd_140>;
+const device_type EPSON_SMD_150 = device_creator<epson_smd_150>;
+const device_type EPSON_SMD_160 = device_creator<epson_smd_160>;
#endif
-const device_type EPSON_SMD_165 = &device_creator<epson_smd_165>;
+const device_type EPSON_SMD_165 = device_creator<epson_smd_165>;
#if 0
-const device_type EPSON_SMD_170 = &device_creator<epson_smd_170>;
-const device_type EPSON_SMD_180 = &device_creator<epson_smd_180>;
-const device_type EPSON_SMD_240L = &device_creator<epson_smd_240l>;
-const device_type EPSON_SMD_280HL = &device_creator<epson_smd_280hl>;
-const device_type EPSON_SMD_440L = &device_creator<epson_smd_440l>;
-const device_type EPSON_SMD_449L = &device_creator<epson_smd_449l>;
-const device_type EPSON_SMD_480LM = &device_creator<epson_smd_480lm>;
-const device_type EPSON_SMD_489M = &device_creator<epson_smd_489m>;
+const device_type EPSON_SMD_170 = device_creator<epson_smd_170>;
+const device_type EPSON_SMD_180 = device_creator<epson_smd_180>;
+const device_type EPSON_SMD_240L = device_creator<epson_smd_240l>;
+const device_type EPSON_SMD_280HL = device_creator<epson_smd_280hl>;
+const device_type EPSON_SMD_440L = device_creator<epson_smd_440l>;
+const device_type EPSON_SMD_449L = device_creator<epson_smd_449l>;
+const device_type EPSON_SMD_480LM = device_creator<epson_smd_480lm>;
+const device_type EPSON_SMD_489M = device_creator<epson_smd_489m>;
#endif
// Epson 5.25" drives
#if 0
-const device_type EPSON_SD_311 = &device_creator<epson_sd_311>;
+const device_type EPSON_SD_311 = device_creator<epson_sd_311>;
#endif
-const device_type EPSON_SD_320 = &device_creator<epson_sd_320>;
-const device_type EPSON_SD_321 = &device_creator<epson_sd_321>;
+const device_type EPSON_SD_320 = device_creator<epson_sd_320>;
+const device_type EPSON_SD_321 = device_creator<epson_sd_321>;
#if 0
-const device_type EPSON_SD_521L = &device_creator<epson_sd_531l>;
-const device_type EPSON_SD_525 = &device_creator<epson_sd_525>;
-const device_type EPSON_SD_543 = &device_creator<epson_sd_543>;
-const device_type EPSON_SD_545 = &device_creator<epson_sd_545>;
-const device_type EPSON_SD_560 = &device_creator<epson_sd_560>;
-const device_type EPSON_SD_580L = &device_creator<epson_sd_580l>;
-const device_type EPSON_SD_581L = &device_creator<epson_sd_581l>;
-const device_type EPSON_SD_621L = &device_creator<epson_sd_621l>;
-const device_type EPSON_SD_680L = &device_creator<epson_sd_680l>;
+const device_type EPSON_SD_521L = device_creator<epson_sd_531l>;
+const device_type EPSON_SD_525 = device_creator<epson_sd_525>;
+const device_type EPSON_SD_543 = device_creator<epson_sd_543>;
+const device_type EPSON_SD_545 = device_creator<epson_sd_545>;
+const device_type EPSON_SD_560 = device_creator<epson_sd_560>;
+const device_type EPSON_SD_580L = device_creator<epson_sd_580l>;
+const device_type EPSON_SD_581L = device_creator<epson_sd_581l>;
+const device_type EPSON_SD_621L = device_creator<epson_sd_621l>;
+const device_type EPSON_SD_680L = device_creator<epson_sd_680l>;
#endif
// Sony 3.5" drives
-const device_type SONY_OA_D31V = &device_creator<sony_oa_d31v>;
-const device_type SONY_OA_D32W = &device_creator<sony_oa_d32w>;
-const device_type SONY_OA_D32V = &device_creator<sony_oa_d32v>;
+const device_type SONY_OA_D31V = device_creator<sony_oa_d31v>;
+const device_type SONY_OA_D32W = device_creator<sony_oa_d32w>;
+const device_type SONY_OA_D32V = device_creator<sony_oa_d32v>;
// TEAC 5.25" drives
#if 0
-const device_type TEAC_FD_55A = &device_creator<teac_fd_55a>;
-const device_type TEAC_FD_55B = &device_creator<teac_fd_55b>;
+const device_type TEAC_FD_55A = device_creator<teac_fd_55a>;
+const device_type TEAC_FD_55B = device_creator<teac_fd_55b>;
#endif
-const device_type TEAC_FD_55E = &device_creator<teac_fd_55e>;
-const device_type TEAC_FD_55F = &device_creator<teac_fd_55f>;
-const device_type TEAC_FD_55G = &device_creator<teac_fd_55g>;
+const device_type TEAC_FD_55E = device_creator<teac_fd_55e>;
+const device_type TEAC_FD_55F = device_creator<teac_fd_55f>;
+const device_type TEAC_FD_55G = device_creator<teac_fd_55g>;
// ALPS 5.25" drives
-const device_type ALPS_3255190x = &device_creator<alps_3255190x>;
+const device_type ALPS_3255190x = device_creator<alps_3255190x>;
// IBM 8" drives
-const device_type IBM_6360 = &device_creator<ibm_6360>;
+const device_type IBM_6360 = device_creator<ibm_6360>;
template class device_finder<floppy_connector, false>;
@@ -1358,7 +1360,7 @@ machine_config_constructor floppy_image_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( floppy_img );
}
-const device_type FLOPPYSOUND = &device_creator<floppy_sound_device>;
+const device_type FLOPPYSOUND = device_creator<floppy_sound_device>;
//**************************************************************************
diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp
index 355b43bcb65..01b773d91f5 100644
--- a/src/devices/imagedev/harddriv.cpp
+++ b/src/devices/imagedev/harddriv.cpp
@@ -32,7 +32,7 @@ static const char *hd_option_spec =
// device type definition
-const device_type HARDDISK = &device_creator<harddisk_image_device>;
+const device_type HARDDISK = device_creator<harddisk_image_device>;
//-------------------------------------------------
// harddisk_image_device - constructor
diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp
index 312c597a31c..ba9d7e2a81d 100644
--- a/src/devices/imagedev/mfmhd.cpp
+++ b/src/devices/imagedev/mfmhd.cpp
@@ -939,7 +939,7 @@ mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, cons
{
}
-const device_type MFMHD_GENERIC = &device_creator<mfm_hd_generic_device>;
+const device_type MFMHD_GENERIC = device_creator<mfm_hd_generic_device>;
/*
Various models.
@@ -955,7 +955,7 @@ mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const ch
m_maxseek_time = 150;
}
-const device_type MFMHD_ST213 = &device_creator<mfm_hd_st213_device>;
+const device_type MFMHD_ST213 = device_creator<mfm_hd_st213_device>;
mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mfm_harddisk_device(mconfig, MFMHD_ST225, "Seagate ST-225 MFM hard disk", tag, owner, clock, "mfm_hd_st225", __FILE__)
@@ -968,7 +968,7 @@ mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const ch
m_maxseek_time = 150;
}
-const device_type MFMHD_ST225 = &device_creator<mfm_hd_st225_device>;
+const device_type MFMHD_ST225 = device_creator<mfm_hd_st225_device>;
mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mfm_harddisk_device(mconfig, MFMHD_ST251, "Seagate ST-251 MFM hard disk", tag, owner, clock, "mfm_hd_st251", __FILE__)
@@ -981,7 +981,7 @@ mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const ch
m_maxseek_time = 70;
}
-const device_type MFMHD_ST251 = &device_creator<mfm_hd_st251_device>;
+const device_type MFMHD_ST251 = device_creator<mfm_hd_st251_device>;
// ===========================================================
// Track cache
@@ -1222,4 +1222,4 @@ void mfm_harddisk_connector::device_config_complete()
}
}
-const device_type MFM_HD_CONNECTOR = &device_creator<mfm_harddisk_connector>;
+const device_type MFM_HD_CONNECTOR = device_creator<mfm_harddisk_connector>;
diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp
index b4c556760db..d19e8bdea57 100644
--- a/src/devices/imagedev/midiin.cpp
+++ b/src/devices/imagedev/midiin.cpp
@@ -16,7 +16,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type MIDIIN = &device_creator<midiin_device>;
+const device_type MIDIIN = device_creator<midiin_device>;
/*-------------------------------------------------
ctor
diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h
index 08429c54003..98566dde197 100644
--- a/src/devices/imagedev/midiin.h
+++ b/src/devices/imagedev/midiin.h
@@ -73,6 +73,6 @@ private:
extern const device_type MIDIIN;
// device iterator
-typedef device_type_iterator<&device_creator<midiin_device>, midiin_device> midiin_device_iterator;
+typedef device_type_iterator<MIDIIN, midiin_device> midiin_device_iterator;
#endif /* __MIDIIN_H__ */
diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp
index e2784f72992..6765d2ab4f0 100644
--- a/src/devices/imagedev/midiout.cpp
+++ b/src/devices/imagedev/midiout.cpp
@@ -16,7 +16,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type MIDIOUT = &device_creator<midiout_device>;
+const device_type MIDIOUT = device_creator<midiout_device>;
/*-------------------------------------------------
ctor
diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h
index b62e9a161c5..b742cb6b746 100644
--- a/src/devices/imagedev/midiout.h
+++ b/src/devices/imagedev/midiout.h
@@ -68,6 +68,6 @@ private:
extern const device_type MIDIOUT;
// device iterator
-typedef device_type_iterator<&device_creator<midiout_device>, midiout_device> midiout_device_iterator;
+typedef device_type_iterator<MIDIOUT, midiout_device> midiout_device_iterator;
#endif /* __MIDIOUT_H__ */
diff --git a/src/devices/imagedev/printer.cpp b/src/devices/imagedev/printer.cpp
index be6abe8df41..90fd4126a2d 100644
--- a/src/devices/imagedev/printer.cpp
+++ b/src/devices/imagedev/printer.cpp
@@ -13,7 +13,7 @@
// device type definition
-const device_type PRINTER = &device_creator<printer_image_device>;
+const device_type PRINTER = device_creator<printer_image_device>;
//-------------------------------------------------
// printer_image_device - constructor
diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp
index 110288abf1f..96d0d2475e2 100644
--- a/src/devices/imagedev/snapquik.cpp
+++ b/src/devices/imagedev/snapquik.cpp
@@ -12,7 +12,7 @@
#include "snapquik.h"
// device type definition
-const device_type SNAPSHOT = &device_creator<snapshot_image_device>;
+const device_type SNAPSHOT = device_creator<snapshot_image_device>;
//-------------------------------------------------
// snapshot_image_device - constructor
@@ -90,7 +90,7 @@ image_init_result snapshot_image_device::call_load()
}
// device type definition
-const device_type QUICKLOAD = &device_creator<quickload_image_device>;
+const device_type QUICKLOAD = device_creator<quickload_image_device>;
//-------------------------------------------------
// quickload_image_device - constructor
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>;
//**************************************************************************
diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp
index 04bdd980c6e..56db3d8da38 100644
--- a/src/devices/sound/2203intf.cpp
+++ b/src/devices/sound/2203intf.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER( ym2203_device::write_port_w )
write(space, 1, data);
}
-const device_type YM2203 = &device_creator<ym2203_device>;
+const device_type YM2203 = device_creator<ym2203_device>;
ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YM2203, "YM2203", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2203", __FILE__),
diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp
index fd409f77cd3..a5471151aa0 100644
--- a/src/devices/sound/2608intf.cpp
+++ b/src/devices/sound/2608intf.cpp
@@ -184,7 +184,7 @@ WRITE8_MEMBER( ym2608_device::write )
ym2608_write(m_chip, offset & 3, data);
}
-const device_type YM2608 = &device_creator<ym2608_device>;
+const device_type YM2608 = device_creator<ym2608_device>;
ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YM2608, "YM2608", tag, owner, clock, PSG_TYPE_YM, 1, 2, "ym2608", __FILE__),
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index 813079d6cb2..8660056c828 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -208,7 +208,7 @@ WRITE8_MEMBER( ym2610_device::write )
}
-const device_type YM2610 = &device_creator<ym2610_device>;
+const device_type YM2610 = device_creator<ym2610_device>;
ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YM2610, "YM2610", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ym2610", __FILE__)
@@ -224,7 +224,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, co
{
}
-const device_type YM2610B = &device_creator<ym2610b_device>;
+const device_type YM2610B = device_creator<ym2610b_device>;
ym2610b_device::ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ym2610_device(mconfig, YM2610B, "YM2610B", tag, owner, clock, "ym2610b", __FILE__)
diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp
index 650c9a35041..b6a1d42b398 100644
--- a/src/devices/sound/2612intf.cpp
+++ b/src/devices/sound/2612intf.cpp
@@ -164,7 +164,7 @@ WRITE8_MEMBER( ym2612_device::write )
}
-const device_type YM2612 = &device_creator<ym2612_device>;
+const device_type YM2612 = device_creator<ym2612_device>;
ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YM2612, "YM2612", tag, owner, clock, "ym2612", __FILE__),
@@ -181,7 +181,7 @@ ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, co
}
-const device_type YM3438 = &device_creator<ym3438_device>;
+const device_type YM3438 = device_creator<ym3438_device>;
ym3438_device::ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ym2612_device(mconfig, YM3438, "YM3438", tag, owner, clock, "ym3438", __FILE__)
diff --git a/src/devices/sound/262intf.cpp b/src/devices/sound/262intf.cpp
index 51c7f5100b2..4c027e5c2a3 100644
--- a/src/devices/sound/262intf.cpp
+++ b/src/devices/sound/262intf.cpp
@@ -135,7 +135,7 @@ WRITE8_MEMBER( ymf262_device::write )
ymf262_write(m_chip, offset & 3, data);
}
-const device_type YMF262 = &device_creator<ymf262_device>;
+const device_type YMF262 = device_creator<ymf262_device>;
ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YMF262, "YMF262", tag, owner, clock, "ymf262", __FILE__),
diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp
index 7ee0f108ca9..5d13ee0dbb2 100644
--- a/src/devices/sound/315-5641.cpp
+++ b/src/devices/sound/315-5641.cpp
@@ -5,7 +5,7 @@
#include "emu.h"
#include "315-5641.h"
-const device_type SEGA_315_5641_PCM = &device_creator<sega_315_5641_pcm_device>;
+const device_type SEGA_315_5641_PCM = device_creator<sega_315_5641_pcm_device>;
sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: upd7759_device(mconfig, SEGA_315_5641_PCM, "315-5641 PCM", tag, owner, clock, "315-5641_pcm", __FILE__), m_fifo_read(0), m_fifo_write(0)
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp
index dc967d21e80..f59a60f114e 100644
--- a/src/devices/sound/3526intf.cpp
+++ b/src/devices/sound/3526intf.cpp
@@ -170,7 +170,7 @@ WRITE8_MEMBER( ym3526_device::control_port_w ) { write(space, 0, data); }
WRITE8_MEMBER( ym3526_device::write_port_w ) { write(space, 1, data); }
-const device_type YM3526 = &device_creator<ym3526_device>;
+const device_type YM3526 = device_creator<ym3526_device>;
ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__),
diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp
index 85aacfa29ff..e9d42a0723b 100644
--- a/src/devices/sound/3812intf.cpp
+++ b/src/devices/sound/3812intf.cpp
@@ -166,7 +166,7 @@ WRITE8_MEMBER( ym3812_device::control_port_w ) { write(space, 0, data); }
WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); }
-const device_type YM3812 = &device_creator<ym3812_device>;
+const device_type YM3812 = device_creator<ym3812_device>;
ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__),
diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp
index 7aecbd64b04..3b6b32eca20 100644
--- a/src/devices/sound/8950intf.cpp
+++ b/src/devices/sound/8950intf.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER( y8950_device::control_port_w ) { write(space, 0, data); }
WRITE8_MEMBER( y8950_device::write_port_w ) { write(space, 1, data); }
-const device_type Y8950 = &device_creator<y8950_device>;
+const device_type Y8950 = device_creator<y8950_device>;
y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__),
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index 79ba429c619..e3489c653c2 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -5,7 +5,10 @@
#include "emu.h"
#include "sound/ad1848.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
const device_type AD1848 = device_creator<ad1848_device>;
diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp
index c6b5aa9b020..b0708e4f135 100644
--- a/src/devices/sound/aica.cpp
+++ b/src/devices/sound/aica.cpp
@@ -1468,7 +1468,7 @@ READ16_MEMBER( aica_device::midi_out_r )
return val;
}
-const device_type AICA = &device_creator<aica_device>;
+const device_type AICA = device_creator<aica_device>;
aica_device::aica_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, AICA, "AICA", tag, owner, clock, "aica", __FILE__),
diff --git a/src/devices/sound/asc.cpp b/src/devices/sound/asc.cpp
index 1b780d5fba9..7cce59b579f 100644
--- a/src/devices/sound/asc.cpp
+++ b/src/devices/sound/asc.cpp
@@ -35,7 +35,7 @@
#include "asc.h"
// device type definition
-const device_type ASC = &device_creator<asc_device>;
+const device_type ASC = device_creator<asc_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/astrocde.cpp b/src/devices/sound/astrocde.cpp
index 2dd01fe0c52..b5d23dcb751 100644
--- a/src/devices/sound/astrocde.cpp
+++ b/src/devices/sound/astrocde.cpp
@@ -46,7 +46,7 @@
// device type definition
-const device_type ASTROCADE = &device_creator<astrocade_device>;
+const device_type ASTROCADE = device_creator<astrocade_device>;
//**************************************************************************
diff --git a/src/devices/sound/awacs.cpp b/src/devices/sound/awacs.cpp
index 1685a37f370..b2d405668ea 100644
--- a/src/devices/sound/awacs.cpp
+++ b/src/devices/sound/awacs.cpp
@@ -14,7 +14,7 @@
#include "awacs.h"
// device type definition
-const device_type AWACS = &device_creator<awacs_device>;
+const device_type AWACS = device_creator<awacs_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp
index f3a5fd4dc5d..a3979b70bf6 100644
--- a/src/devices/sound/ay8910.cpp
+++ b/src/devices/sound/ay8910.cpp
@@ -1142,7 +1142,7 @@ WRITE8_MEMBER( ay8914_device::write )
-const device_type AY8910 = &device_creator<ay8910_device>;
+const device_type AY8910 = device_creator<ay8910_device>;
ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock, "ay8910", __FILE__),
@@ -1252,7 +1252,7 @@ void ay8910_device::set_type(psg_type_t psg_type)
}
}
-const device_type AY8912 = &device_creator<ay8912_device>;
+const device_type AY8912 = device_creator<ay8912_device>;
ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, AY8912, "AY-3-8912A", tag, owner, clock, PSG_TYPE_AY, 3, 1, "ay8912", __FILE__)
@@ -1260,7 +1260,7 @@ ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type AY8913 = &device_creator<ay8913_device>;
+const device_type AY8913 = device_creator<ay8913_device>;
ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, AY8913, "AY-3-8913A", tag, owner, clock, PSG_TYPE_AY, 3, 0, "ay8913", __FILE__)
@@ -1268,7 +1268,7 @@ ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type AY8914 = &device_creator<ay8914_device>;
+const device_type AY8914 = device_creator<ay8914_device>;
ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, AY8914, "AY-3-8914", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8914", __FILE__)
@@ -1276,7 +1276,7 @@ ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type AY8930 = &device_creator<ay8930_device>;
+const device_type AY8930 = device_creator<ay8930_device>;
ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, AY8930, "AY8930", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8930", __FILE__)
@@ -1284,7 +1284,7 @@ ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type YM2149 = &device_creator<ym2149_device>;
+const device_type YM2149 = device_creator<ym2149_device>;
ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YM2149, "YM2149", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2149", __FILE__)
@@ -1292,7 +1292,7 @@ ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type YM3439 = &device_creator<ym3439_device>;
+const device_type YM3439 = device_creator<ym3439_device>;
ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YM3439, "YM3439", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym3429", __FILE__)
@@ -1300,7 +1300,7 @@ ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type YMZ284 = &device_creator<ymz284_device>;
+const device_type YMZ284 = device_creator<ymz284_device>;
ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YMZ284, "YMZ284", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz284", __FILE__)
@@ -1308,7 +1308,7 @@ ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type YMZ294 = &device_creator<ymz294_device>;
+const device_type YMZ294 = device_creator<ymz294_device>;
ymz294_device::ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ay8910_device(mconfig, YMZ294, "YMZ294", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz294", __FILE__)
diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp
index 0b343cbd0f7..1b986fa6c61 100644
--- a/src/devices/sound/beep.cpp
+++ b/src/devices/sound/beep.cpp
@@ -20,7 +20,7 @@
// device type definition
-const device_type BEEP = &device_creator<beep_device>;
+const device_type BEEP = device_creator<beep_device>;
//**************************************************************************
diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp
index 0c975d105e5..b45a2e40f3f 100644
--- a/src/devices/sound/bsmt2000.cpp
+++ b/src/devices/sound/bsmt2000.cpp
@@ -18,7 +18,7 @@
// device type definition
-const device_type BSMT2000 = &device_creator<bsmt2000_device>;
+const device_type BSMT2000 = device_creator<bsmt2000_device>;
//**************************************************************************
diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp
index b296dc2d57f..42bebcf452d 100644
--- a/src/devices/sound/c140.cpp
+++ b/src/devices/sound/c140.cpp
@@ -67,7 +67,7 @@ struct voice_registers
// device type definition
-const device_type C140 = &device_creator<c140_device>;
+const device_type C140 = device_creator<c140_device>;
//**************************************************************************
diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp
index ae47740c8db..d8e6dc03c63 100644
--- a/src/devices/sound/c352.cpp
+++ b/src/devices/sound/c352.cpp
@@ -23,7 +23,7 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
// device type definition
-const device_type C352 = &device_creator<c352_device>;
+const device_type C352 = device_creator<c352_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp
index 276a1962447..5e41873054d 100644
--- a/src/devices/sound/c6280.cpp
+++ b/src/devices/sound/c6280.cpp
@@ -229,7 +229,7 @@ WRITE8_MEMBER( c6280_device::c6280_w )
}
}
-const device_type C6280 = &device_creator<c6280_device>;
+const device_type C6280 = device_creator<c6280_device>;
c6280_device::c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C6280, "HuC6280", tag, owner, clock, "c6280", __FILE__)
diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp
index 24c2e326e85..2e4ec409a26 100644
--- a/src/devices/sound/cdda.cpp
+++ b/src/devices/sound/cdda.cpp
@@ -231,7 +231,7 @@ int16_t cdda_device::get_channel_volume(int channel)
return m_audio_volume[channel];
}
-const device_type CDDA = &device_creator<cdda_device>;
+const device_type CDDA = device_creator<cdda_device>;
cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CDDA, "CD/DA", tag, owner, clock, "cdda", __FILE__),
diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp
index 51a52ca286d..2b6396084dd 100644
--- a/src/devices/sound/cdp1863.cpp
+++ b/src/devices/sound/cdp1863.cpp
@@ -35,7 +35,7 @@
//**************************************************************************
// devices
-const device_type CDP1863 = &device_creator<cdp1863_device>;
+const device_type CDP1863 = device_creator<cdp1863_device>;
diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp
index 78e3fbfbd7d..a42300aca00 100644
--- a/src/devices/sound/cdp1864.cpp
+++ b/src/devices/sound/cdp1864.cpp
@@ -45,7 +45,7 @@ const int cdp1864_device::bckgnd[] = { 2, 0, 4, 1 };
//**************************************************************************
// devices
-const device_type CDP1864 = &device_creator<cdp1864_device>;
+const device_type CDP1864 = device_creator<cdp1864_device>;
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index 34f1c0be117..d27d817f605 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -32,14 +32,16 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_DEVICES_SOUND_CDP1864_H
+#define MAME_DEVICES_SOUND_CDP1864_H
-#ifndef __CDP1864__
-#define __CDP1864__
+#pragma once
#include "machine/rescap.h"
#include "video/resnet.h"
+#include "screen.h"
+
//**************************************************************************
@@ -202,6 +204,4 @@ private:
// device type definition
extern const device_type CDP1864;
-
-
-#endif
+#endif // MAME_DEVICES_SOUND_CDP1864_H
diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp
index 7a76ed6d3d0..b9dae5d4884 100644
--- a/src/devices/sound/cdp1869.cpp
+++ b/src/devices/sound/cdp1869.cpp
@@ -56,7 +56,7 @@ enum
//**************************************************************************
// device type definition
-const device_type CDP1869 = &device_creator<cdp1869_device>;
+const device_type CDP1869 = device_creator<cdp1869_device>;
// I/O map
DEVICE_ADDRESS_MAP_START( io_map, 8, cdp1869_device )
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index 035631e12e3..b2125c89caf 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -73,11 +73,12 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_DEVICES_SOUND_CDP1869_H
+#define MAME_DEVICES_SOUND_CDP1869_H
-#ifndef __CDP1869__
-#define __CDP1869__
+#pragma once
+#include "screen.h"
@@ -298,4 +299,4 @@ extern const device_type CDP1869;
-#endif
+#endif // MAME_DEVICES_SOUND_CDP1869_H
diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp
index 4e264f5be1b..d4b1e9ef501 100644
--- a/src/devices/sound/cem3394.cpp
+++ b/src/devices/sound/cem3394.cpp
@@ -105,7 +105,7 @@
// device type definition
-const device_type CEM3394 = &device_creator<cem3394_device>;
+const device_type CEM3394 = device_creator<cem3394_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp
index fc413390107..dd0e24b6829 100644
--- a/src/devices/sound/dac.cpp
+++ b/src/devices/sound/dac.cpp
@@ -13,7 +13,7 @@
***************************************************************************/
#define DAC_GENERATOR_EPILOG(_dac_type, _dac_class) \
-const device_type _dac_type = &device_creator<_dac_class>;
+const device_type _dac_type = device_creator<_dac_class>;
#include "emu.h"
#include "dac.h"
diff --git a/src/devices/sound/dac76.cpp b/src/devices/sound/dac76.cpp
index 0aa8dc93798..53739e1c254 100644
--- a/src/devices/sound/dac76.cpp
+++ b/src/devices/sound/dac76.cpp
@@ -23,7 +23,7 @@ constexpr int dac76_device::m_level[];
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DAC76 = &device_creator<dac76_device>;
+const device_type DAC76 = device_creator<dac76_device>;
//**************************************************************************
diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp
index 573bc010e99..342ba571aaf 100644
--- a/src/devices/sound/dave.cpp
+++ b/src/devices/sound/dave.cpp
@@ -25,7 +25,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DAVE = &device_creator<dave_device>;
+const device_type DAVE = device_creator<dave_device>;
DEVICE_ADDRESS_MAP_START( z80_program_map, 8, dave_device )
diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h
index 1c22369a62e..10e9fb26905 100644
--- a/src/devices/sound/dave.h
+++ b/src/devices/sound/dave.h
@@ -6,12 +6,10 @@
**********************************************************************/
-#pragma once
-
-#ifndef __DAVE__
-#define __DAVE__
-
+#ifndef MAME_DEVICES_SOUND_DAVE_H
+#define MAME_DEVICES_SOUND_DAVE_H
+#pragma once
///*************************************************************************
@@ -150,6 +148,4 @@ private:
// device type definition
extern const device_type DAVE;
-
-
-#endif
+#endif // MAME_DEVICES_SOUND_DAVE_H
diff --git a/src/devices/sound/digitalk.cpp b/src/devices/sound/digitalk.cpp
index 8d8f40bf694..329eb1c1e7f 100644
--- a/src/devices/sound/digitalk.cpp
+++ b/src/devices/sound/digitalk.cpp
@@ -261,7 +261,7 @@ static const int pitch_vals[32] = {
};
-const device_type DIGITALKER = &device_creator<digitalker_device>;
+const device_type DIGITALKER = device_creator<digitalker_device>;
digitalker_device::digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock, "digitalker", __FILE__),
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index aebd59f13b6..62c8707067a 100644
--- a/src/devices/sound/discrete.cpp
+++ b/src/devices/sound/discrete.cpp
@@ -45,7 +45,7 @@
#define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++)
// device type definition
-const device_type DISCRETE = &device_creator<discrete_sound_device>;
+const device_type DISCRETE = device_creator<discrete_sound_device>;
/*************************************
*
diff --git a/src/devices/sound/dmadac.cpp b/src/devices/sound/dmadac.cpp
index 4ee9523ef7b..fc8f3a3b8fe 100644
--- a/src/devices/sound/dmadac.cpp
+++ b/src/devices/sound/dmadac.cpp
@@ -196,7 +196,7 @@ void dmadac_sound_device::set_volume(uint16_t volume)
m_volume = volume;
}
-const device_type DMADAC = &device_creator<dmadac_sound_device>;
+const device_type DMADAC = device_creator<dmadac_sound_device>;
dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMADAC, "DMA-driven DAC", tag, owner, clock, "dmadac", __FILE__),
diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp
index 5f6a14e63c5..61ef546d5c5 100644
--- a/src/devices/sound/es1373.cpp
+++ b/src/devices/sound/es1373.cpp
@@ -3,9 +3,12 @@
#include "emu.h"
#include "es1373.h"
+#include "speaker.h"
+
+
#define LOG_ES (0)
#define LOG_ES_REG (0)
-#define LOG_ES_FILE (0)
+#define LOG_ES_FILE (0)
static MACHINE_CONFIG_FRAGMENT( es1373 )
@@ -17,7 +20,7 @@ machine_config_constructor es1373_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( es1373 );
}
-const device_type ES1373 = &device_creator<es1373_device>;
+const device_type ES1373 = device_creator<es1373_device>;
DEVICE_ADDRESS_MAP_START(map, 32, es1373_device)
AM_RANGE(0x00, 0x3f) AM_READWRITE (reg_r, reg_w)
diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp
index 591e72827ca..39b57df0b3e 100644
--- a/src/devices/sound/es5503.cpp
+++ b/src/devices/sound/es5503.cpp
@@ -36,7 +36,7 @@
#include "es5503.h"
// device type definition
-const device_type ES5503 = &device_creator<es5503_device>;
+const device_type ES5503 = device_creator<es5503_device>;
// useful constants
static const uint16_t wavesizes[8] = { 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 };
diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp
index 5611857e83b..d5205a6996b 100644
--- a/src/devices/sound/es5506.cpp
+++ b/src/devices/sound/es5506.cpp
@@ -163,7 +163,7 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co
}
}
-const device_type ES5506 = &device_creator<es5506_device>;
+const device_type ES5506 = device_creator<es5506_device>;
es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: es550x_device(mconfig, ES5506, "ES5506", tag, owner, clock, "es5506", __FILE__)
@@ -337,7 +337,7 @@ void es550x_device::device_stop()
#endif
}
-const device_type ES5505 = &device_creator<es5505_device>;
+const device_type ES5505 = device_creator<es5505_device>;
es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: es550x_device(mconfig, ES5505, "ES5505", tag, owner, clock, "es5505", __FILE__)
diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp
index 4cba75e0d10..fe1e94fb01e 100644
--- a/src/devices/sound/es8712.cpp
+++ b/src/devices/sound/es8712.cpp
@@ -33,7 +33,7 @@ static int diff_lookup[49*16];
// device type definition
-const device_type ES8712 = &device_creator<es8712_device>;
+const device_type ES8712 = device_creator<es8712_device>;
//**************************************************************************
diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp
index 988aaa7f9d5..a6a5cbb3c2b 100644
--- a/src/devices/sound/esqpump.cpp
+++ b/src/devices/sound/esqpump.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "sound/esqpump.h"
-const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>;
+const device_type ESQ_5505_5510_PUMP = device_creator<esq_5505_5510_pump>;
esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock, "esq_5505_5510_pump", __FILE__),
diff --git a/src/devices/sound/flt_rc.cpp b/src/devices/sound/flt_rc.cpp
index 1f53ee8581e..56585593721 100644
--- a/src/devices/sound/flt_rc.cpp
+++ b/src/devices/sound/flt_rc.cpp
@@ -5,7 +5,7 @@
// device type definition
-const device_type FILTER_RC = &device_creator<filter_rc_device>;
+const device_type FILTER_RC = device_creator<filter_rc_device>;
//**************************************************************************
diff --git a/src/devices/sound/flt_vol.cpp b/src/devices/sound/flt_vol.cpp
index e92aec24532..f6c4ea1564e 100644
--- a/src/devices/sound/flt_vol.cpp
+++ b/src/devices/sound/flt_vol.cpp
@@ -5,7 +5,7 @@
// device type definition
-const device_type FILTER_VOLUME = &device_creator<filter_volume_device>;
+const device_type FILTER_VOLUME = device_creator<filter_volume_device>;
//-------------------------------------------------
// filter_volume_device - constructor
diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp
index a86fa265ffd..b1b1d111788 100644
--- a/src/devices/sound/gaelco.cpp
+++ b/src/devices/sound/gaelco.cpp
@@ -54,7 +54,7 @@ static wav_file* wavraw; // Raw waveform
Gaelco GAE1 sound device
============================================================================*/
-const device_type GAELCO_GAE1 = &device_creator<gaelco_gae1_device>;
+const device_type GAELCO_GAE1 = device_creator<gaelco_gae1_device>;
gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gaelco_gae1_device(mconfig, GAELCO_GAE1, "Gaelco GAE1", tag, owner, clock, "gaelco_gae1", __FILE__)
@@ -264,7 +264,7 @@ void gaelco_gae1_device::device_stop()
Gaelco CG-1V sound device
============================================================================*/
-const device_type GAELCO_CG1V = &device_creator<gaelco_cg1v_device>;
+const device_type GAELCO_CG1V = device_creator<gaelco_cg1v_device>;
gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gaelco_gae1_device(mconfig, GAELCO_CG1V, "Gaelco CG1V", tag, owner, clock, "gaelco_cg1v", __FILE__)
diff --git a/src/devices/sound/gb.cpp b/src/devices/sound/gb.cpp
index 163ce8e1879..ef06c7a84da 100644
--- a/src/devices/sound/gb.cpp
+++ b/src/devices/sound/gb.cpp
@@ -71,10 +71,10 @@ const int gameboy_sound_device::wave_duty_table[4][8] =
};
// device type definitions
-const device_type DMG_APU = &device_creator<dmg_apu_device>;
-//const device_type CGB02_APU = &device_creator<cgb02_apu_device>;
-const device_type CGB04_APU = &device_creator<cgb04_apu_device>;
-//const device_type CGB05_APU = &device_creator<cgb05_apu_device>;
+const device_type DMG_APU = device_creator<dmg_apu_device>;
+//const device_type CGB02_APU = device_creator<cgb02_apu_device>;
+const device_type CGB04_APU = device_creator<cgb04_apu_device>;
+//const device_type CGB05_APU = device_creator<cgb05_apu_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp
index 704fedbd011..59a248e6b7f 100644
--- a/src/devices/sound/hc55516.cpp
+++ b/src/devices/sound/hc55516.cpp
@@ -23,7 +23,7 @@
-const device_type HC55516 = &device_creator<hc55516_device>;
+const device_type HC55516 = device_creator<hc55516_device>;
hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, HC55516, "HC-55516", tag, owner, clock, "hc55516", __FILE__),
@@ -84,7 +84,7 @@ void hc55516_device::device_reset()
m_last_clock_state = 0;
}
-const device_type MC3417 = &device_creator<mc3417_device>;
+const device_type MC3417 = device_creator<mc3417_device>;
mc3417_device::mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: hc55516_device(mconfig, MC3417, "MC3417", tag, owner, clock, "mc3417", __FILE__)
@@ -101,7 +101,7 @@ void mc3417_device::device_start()
}
-const device_type MC3418 = &device_creator<mc3418_device>;
+const device_type MC3418 = device_creator<mc3418_device>;
mc3418_device::mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: hc55516_device(mconfig, MC3418, "MC3418", tag, owner, clock, "mc3418", __FILE__)
diff --git a/src/devices/sound/i5000.cpp b/src/devices/sound/i5000.cpp
index f8719923be5..d1532929ff5 100644
--- a/src/devices/sound/i5000.cpp
+++ b/src/devices/sound/i5000.cpp
@@ -21,7 +21,7 @@
// device type definition
-const device_type I5000_SND = &device_creator<i5000snd_device>;
+const device_type I5000_SND = device_creator<i5000snd_device>;
i5000snd_device::i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, I5000_SND, "I5000", tag, owner, clock, "i5000snd", __FILE__),
diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp
index 523fe4e2bbc..0b0db0768fe 100644
--- a/src/devices/sound/ics2115.cpp
+++ b/src/devices/sound/ics2115.cpp
@@ -15,7 +15,7 @@
//#define ICS2115_ISOLATE 6
// device type definition
-const device_type ICS2115 = &device_creator<ics2115_device>;
+const device_type ICS2115 = device_creator<ics2115_device>;
ics2115_device::ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ICS2115, "ICS2115", tag, owner, clock, "ics2115", __FILE__),
diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp
index 2a9e1433e81..f05944a4123 100644
--- a/src/devices/sound/iremga20.cpp
+++ b/src/devices/sound/iremga20.cpp
@@ -35,7 +35,7 @@ Revisions:
// device type definition
-const device_type IREMGA20 = &device_creator<iremga20_device>;
+const device_type IREMGA20 = device_creator<iremga20_device>;
//**************************************************************************
diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp
index 0a0f004417f..91075735ae8 100644
--- a/src/devices/sound/k005289.cpp
+++ b/src/devices/sound/k005289.cpp
@@ -42,7 +42,7 @@
#define CLOCK_DIVIDER 32
// device type definition
-const device_type K005289 = &device_creator<k005289_device>;
+const device_type K005289 = device_creator<k005289_device>;
//**************************************************************************
diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp
index 81e4f19eec7..ec9cbeb53a4 100644
--- a/src/devices/sound/k007232.cpp
+++ b/src/devices/sound/k007232.cpp
@@ -145,7 +145,7 @@ static const float kdaca_fn[][2] = {
/*************************************************************/
-const device_type K007232 = &device_creator<k007232_device>;
+const device_type K007232 = device_creator<k007232_device>;
k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, K007232, "K007232 PCM Controller", tag, owner, clock, "k007232", __FILE__),
diff --git a/src/devices/sound/k051649.cpp b/src/devices/sound/k051649.cpp
index 7877d949a9c..599686f0622 100644
--- a/src/devices/sound/k051649.cpp
+++ b/src/devices/sound/k051649.cpp
@@ -32,7 +32,7 @@
// device type definition
-const device_type K051649 = &device_creator<k051649_device>;
+const device_type K051649 = device_creator<k051649_device>;
//**************************************************************************
diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp
index 992912f46f2..313c9d9b3a8 100644
--- a/src/devices/sound/k053260.cpp
+++ b/src/devices/sound/k053260.cpp
@@ -62,7 +62,7 @@
// device type definition
-const device_type K053260 = &device_creator<k053260_device>;
+const device_type K053260 = device_creator<k053260_device>;
//**************************************************************************
diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp
index 78b6d08b291..5674e0b84e2 100644
--- a/src/devices/sound/k054539.cpp
+++ b/src/devices/sound/k054539.cpp
@@ -12,7 +12,7 @@
#include "emu.h"
#include "k054539.h"
-const device_type K054539 = &device_creator<k054539_device>;
+const device_type K054539 = device_creator<k054539_device>;
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp
index fe42ed0b1bb..5ee7a6c9ad9 100644
--- a/src/devices/sound/k056800.cpp
+++ b/src/devices/sound/k056800.cpp
@@ -12,7 +12,7 @@
-const device_type K056800 = &device_creator<k056800_device>;
+const device_type K056800 = device_creator<k056800_device>;
diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp
index 1b3f2ced640..a1378a80a01 100644
--- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp
+++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp
@@ -89,7 +89,7 @@
// device type definition
-const device_type L7A1045 = &device_creator<l7a1045_sound_device>;
+const device_type L7A1045 = device_creator<l7a1045_sound_device>;
//**************************************************************************
diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp
index 96cb91b094d..469b98ec307 100644
--- a/src/devices/sound/lmc1992.cpp
+++ b/src/devices/sound/lmc1992.cpp
@@ -64,7 +64,7 @@ enum
//**************************************************************************
// devices
-const device_type LMC1992 = &device_creator<lmc1992_device>;
+const device_type LMC1992 = device_creator<lmc1992_device>;
diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp
index ecf54a5b9f4..358badd121f 100644
--- a/src/devices/sound/mas3507d.cpp
+++ b/src/devices/sound/mas3507d.cpp
@@ -8,7 +8,7 @@
#include "mas3507d.h"
// device type definition
-const device_type MAS3507D = &device_creator<mas3507d_device>;
+const device_type MAS3507D = device_creator<mas3507d_device>;
mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MAS3507D, "MAS3507D", tag, owner, clock, "mas3507d", __FILE__),
diff --git a/src/devices/sound/mea8000.cpp b/src/devices/sound/mea8000.cpp
index c3fd263aaba..d800adebfa4 100644
--- a/src/devices/sound/mea8000.cpp
+++ b/src/devices/sound/mea8000.cpp
@@ -111,7 +111,7 @@ static const int pi_table[32] =
-const device_type MEA8000 = &device_creator<mea8000_device>;
+const device_type MEA8000 = device_creator<mea8000_device>;
mea8000_device::mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp
index 9ab3dd70141..7a8626eaf77 100644
--- a/src/devices/sound/mm5837.cpp
+++ b/src/devices/sound/mm5837.cpp
@@ -23,7 +23,7 @@ constexpr int mm5837_device::m_frequency[];
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MM5837 = &device_creator<mm5837_device>;
+const device_type MM5837 = device_creator<mm5837_device>;
//**************************************************************************
diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp
index 6d35f6bc9f1..126064c37db 100644
--- a/src/devices/sound/mos6560.cpp
+++ b/src/devices/sound/mos6560.cpp
@@ -675,9 +675,9 @@ void mos6560_device::sound_start()
}
-const device_type MOS6560 = &device_creator<mos6560_device>;
-const device_type MOS6561 = &device_creator<mos6561_device>;
-const device_type MOS656X_ATTACK_UFO = &device_creator<mos656x_attack_ufo_device>;
+const device_type MOS6560 = device_creator<mos6560_device>;
+const device_type MOS6561 = device_creator<mos6561_device>;
+const device_type MOS656X_ATTACK_UFO = device_creator<mos656x_attack_ufo_device>;
// default address maps
static ADDRESS_MAP_START( mos6560_videoram_map, AS_0, 8, mos6560_device )
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index 849ff00d87d..77a715fd67a 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -29,12 +29,12 @@
***************************************************************************/
-#pragma once
-
-#ifndef __MOS6560__
-#define __MOS6560__
+#ifndef MAME_DEVICES_SOUND_MOS6560_H
+#define MAME_DEVICES_SOUND_MOS6560_H
+#pragma once
+#include "screen.h"
//***************************************************************************
@@ -256,4 +256,4 @@ extern const device_type MOS656X_ATTACK_UFO;
-#endif
+#endif // MAME_DEVICES_SOUND_MOS6560_H
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 7854021a72d..635605736d9 100644
--- a/src/devices/sound/mos6581.cpp
+++ b/src/devices/sound/mos6581.cpp
@@ -25,8 +25,8 @@
//**************************************************************************
// device type definition
-const device_type MOS6581 = &device_creator<mos6581_device>;
-const device_type MOS8580 = &device_creator<mos8580_device>;
+const device_type MOS6581 = device_creator<mos6581_device>;
+const device_type MOS8580 = device_creator<mos8580_device>;
diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp
index ca70ad888ea..6d178e77753 100644
--- a/src/devices/sound/mos7360.cpp
+++ b/src/devices/sound/mos7360.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "mos7360.h"
+#include "screen.h"
+
//**************************************************************************
@@ -158,7 +160,7 @@ static const rgb_t PALETTE_MOS[] =
//**************************************************************************
// device type definition
-const device_type MOS7360 = &device_creator<mos7360_device>;
+const device_type MOS7360 = device_creator<mos7360_device>;
// default address maps
diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp
index 9d84cae1dd4..c182787594a 100644
--- a/src/devices/sound/msm5205.cpp
+++ b/src/devices/sound/msm5205.cpp
@@ -56,8 +56,8 @@
*/
-const device_type MSM5205 = &device_creator<msm5205_device>;
-const device_type MSM6585 = &device_creator<msm6585_device>;
+const device_type MSM5205 = device_creator<msm5205_device>;
+const device_type MSM6585 = device_creator<msm6585_device>;
msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp
index 7ffd927c055..772bdbd01b4 100644
--- a/src/devices/sound/msm5232.cpp
+++ b/src/devices/sound/msm5232.cpp
@@ -11,7 +11,7 @@
8 channel tone generator
*/
-const device_type MSM5232 = &device_creator<msm5232_device>;
+const device_type MSM5232 = device_creator<msm5232_device>;
msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSM5232, "MSM5232", tag, owner, clock, "msm5232", __FILE__),
diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp
index f4a885413ce..31ffb2705d8 100644
--- a/src/devices/sound/multipcm.cpp
+++ b/src/devices/sound/multipcm.cpp
@@ -464,7 +464,7 @@ void multipcm_device::set_bank(uint32_t leftoffs, uint32_t rightoffs)
printf("%08x, %08x\n", leftoffs, rightoffs);
}
-const device_type MULTIPCM = &device_creator<multipcm_device>;
+const device_type MULTIPCM = device_creator<multipcm_device>;
multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock, "multipcm", __FILE__),
diff --git a/src/devices/sound/n63701x.cpp b/src/devices/sound/n63701x.cpp
index 0d9cd66134b..dda616698d3 100644
--- a/src/devices/sound/n63701x.cpp
+++ b/src/devices/sound/n63701x.cpp
@@ -29,7 +29,7 @@ static const int vol_table[4] = { 26, 84, 200, 258 };
// device type definition
-const device_type NAMCO_63701X = &device_creator<namco_63701x_device>;
+const device_type NAMCO_63701X = device_creator<namco_63701x_device>;
namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock, "namco_63701x", __FILE__),
diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp
index ba55f89d0c9..cd2ab748555 100644
--- a/src/devices/sound/namco.cpp
+++ b/src/devices/sound/namco.cpp
@@ -43,9 +43,9 @@
/* a position of waveform sample */
#define WAVEFORM_POSITION(n) (((n) >> m_f_fracbits) & 0x1f)
-const device_type NAMCO = &device_creator<namco_device>;
-const device_type NAMCO_15XX = &device_creator<namco_15xx_device>;
-const device_type NAMCO_CUS30 = &device_creator<namco_cus30_device>;
+const device_type NAMCO = device_creator<namco_device>;
+const device_type NAMCO_15XX = device_creator<namco_15xx_device>;
+const device_type NAMCO_CUS30 = device_creator<namco_cus30_device>;
namco_audio_device::namco_audio_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, __FILE__)
diff --git a/src/devices/sound/nes_apu.cpp b/src/devices/sound/nes_apu.cpp
index 39d8d32613d..d2b6a98b900 100644
--- a/src/devices/sound/nes_apu.cpp
+++ b/src/devices/sound/nes_apu.cpp
@@ -48,7 +48,9 @@
#include "emu.h"
#include "nes_apu.h"
+
#include "cpu/m6502/n2a03.h"
+#include "screen.h"
@@ -101,7 +103,7 @@ static void create_noise(uint8 *buf, const int bits, int size)
}
}
-const device_type NES_APU = &device_creator<nesapu_device>;
+const device_type NES_APU = device_creator<nesapu_device>;
nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_APU, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__),
diff --git a/src/devices/sound/nile.cpp b/src/devices/sound/nile.cpp
index 09a8d02ce21..34b907fe686 100644
--- a/src/devices/sound/nile.cpp
+++ b/src/devices/sound/nile.cpp
@@ -50,7 +50,7 @@ enum
};
-const device_type NILE = &device_creator<nile_device>;
+const device_type NILE = device_creator<nile_device>;
nile_device::nile_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NILE, "NiLe", tag, owner, clock, "nile", __FILE__),
diff --git a/src/devices/sound/okim6258.cpp b/src/devices/sound/okim6258.cpp
index 57a87dd71fa..e67a6bcb12e 100644
--- a/src/devices/sound/okim6258.cpp
+++ b/src/devices/sound/okim6258.cpp
@@ -35,7 +35,7 @@ static int tables_computed = 0;
// device type definition
-const device_type OKIM6258 = &device_creator<okim6258_device>;
+const device_type OKIM6258 = device_creator<okim6258_device>;
//**************************************************************************
diff --git a/src/devices/sound/okim6295.cpp b/src/devices/sound/okim6295.cpp
index d1aa03c9c41..c7c49abf7b3 100644
--- a/src/devices/sound/okim6295.cpp
+++ b/src/devices/sound/okim6295.cpp
@@ -46,7 +46,7 @@
//**************************************************************************
// device type definition
-const device_type OKIM6295 = &device_creator<okim6295_device>;
+const device_type OKIM6295 = device_creator<okim6295_device>;
// volume lookup table. The manual lists only 9 steps, ~3dB per step. Given the dB values,
// that seems to map to a 5-bit volume control. Any volume parameter beyond the 9th index
diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp
index 51baee59ada..1a852599529 100644
--- a/src/devices/sound/okim6376.cpp
+++ b/src/devices/sound/okim6376.cpp
@@ -110,7 +110,7 @@ static void reset_adpcm(struct ADPCMVoice *voice)
}
-const device_type OKIM6376 = &device_creator<okim6376_device>;
+const device_type OKIM6376 = device_creator<okim6376_device>;
okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, OKIM6376, "OKI6376", tag, owner, clock, "okim6376", __FILE__),
diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp
index 1e687b4be9d..35ce795d877 100644
--- a/src/devices/sound/okim9810.cpp
+++ b/src/devices/sound/okim9810.cpp
@@ -17,7 +17,7 @@
//**************************************************************************
// device type definition
-const device_type OKIM9810 = &device_creator<okim9810_device>;
+const device_type OKIM9810 = device_creator<okim9810_device>;
// volume lookup table. The manual lists a full 16 steps, 2dB per step.
// Given the dB values, that seems to map to a 7-bit volume control.
diff --git a/src/devices/sound/pcd3311.cpp b/src/devices/sound/pcd3311.cpp
index 50a017da863..b2ab6fc8130 100644
--- a/src/devices/sound/pcd3311.cpp
+++ b/src/devices/sound/pcd3311.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PCD3311 = &device_creator<pcd3311_t>;
+const device_type PCD3311 = device_creator<pcd3311_t>;
diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp
index 8f6afc300bd..b263c50b803 100644
--- a/src/devices/sound/pci-ac97.cpp
+++ b/src/devices/sound/pci-ac97.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "pci-ac97.h"
-const device_type AC97 = &device_creator<ac97_device>;
+const device_type AC97 = device_creator<ac97_device>;
DEVICE_ADDRESS_MAP_START(native_audio_mixer_map, 32, ac97_device)
ADDRESS_MAP_END
diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
index bbbe51707d8..61cd505a28e 100644
--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
@@ -167,7 +167,7 @@ static const int clock_divisors[3] = {1, DIV_64, DIV_15};
// device type definition
-const device_type POKEY = &device_creator<pokey_device>;
+const device_type POKEY = device_creator<pokey_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp
index a85bc8fa707..c34171e39c6 100644
--- a/src/devices/sound/qs1000.cpp
+++ b/src/devices/sound/qs1000.cpp
@@ -131,7 +131,7 @@
// device type definition
-const device_type QS1000 = &device_creator<qs1000_device>;
+const device_type QS1000 = device_creator<qs1000_device>;
//**************************************************************************
// GLOBAL VARIABLES
diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp
index ddc94045d36..6b69f69e9aa 100644
--- a/src/devices/sound/qsound.cpp
+++ b/src/devices/sound/qsound.cpp
@@ -27,7 +27,7 @@
#include "qsound.h"
// device type definition
-const device_type QSOUND = &device_creator<qsound_device>;
+const device_type QSOUND = device_creator<qsound_device>;
// program map for the DSP (points to internal 4096 words of internal ROM)
diff --git a/src/devices/sound/rf5c400.cpp b/src/devices/sound/rf5c400.cpp
index 2399acdcd04..df355b5a03c 100644
--- a/src/devices/sound/rf5c400.cpp
+++ b/src/devices/sound/rf5c400.cpp
@@ -54,7 +54,7 @@ enum
// device type definition
-const device_type RF5C400 = &device_creator<rf5c400_device>;
+const device_type RF5C400 = device_creator<rf5c400_device>;
//**************************************************************************
diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp
index 7faedb54398..532e3dcaf26 100644
--- a/src/devices/sound/rf5c68.cpp
+++ b/src/devices/sound/rf5c68.cpp
@@ -9,7 +9,7 @@
// device type definition
-const device_type RF5C68 = &device_creator<rf5c68_device>;
+const device_type RF5C68 = device_creator<rf5c68_device>;
//**************************************************************************
diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp
index 3eea3dee24d..9bc112232f2 100644
--- a/src/devices/sound/s14001a.cpp
+++ b/src/devices/sound/s14001a.cpp
@@ -107,7 +107,7 @@ and off as it normally does during speech). Once START has gone low-high-low, th
#include "s14001a.h"
// device definition
-const device_type S14001A = &device_creator<s14001a_device>;
+const device_type S14001A = device_creator<s14001a_device>;
s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S14001A, "S14001A", tag, owner, clock, "s14001a", __FILE__),
diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp
index 62d232a394f..c1ce05f5a2a 100644
--- a/src/devices/sound/saa1099.cpp
+++ b/src/devices/sound/saa1099.cpp
@@ -123,7 +123,7 @@ static const uint8_t envelope[8][64] = {
// device type definition
-const device_type SAA1099 = &device_creator<saa1099_device>;
+const device_type SAA1099 = device_creator<saa1099_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp
index 1d0c3c8c179..3363d8ad026 100644
--- a/src/devices/sound/samples.cpp
+++ b/src/devices/sound/samples.cpp
@@ -33,7 +33,7 @@
//**************************************************************************
// device type definition
-const device_type SAMPLES = &device_creator<samples_device>;
+const device_type SAMPLES = device_creator<samples_device>;
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index 288d46f4d51..5393d6843f0 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -123,7 +123,7 @@ protected:
};
// iterator, since lots of people are interested in these devices
-typedef device_type_iterator<&device_creator<samples_device>, samples_device> samples_device_iterator;
+typedef device_type_iterator<device_creator<samples_device>, samples_device> samples_device_iterator;
// ======================> samples_iterator
diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp
index 20bdac1331e..6fbbf0a2f85 100644
--- a/src/devices/sound/sb0400.cpp
+++ b/src/devices/sound/sb0400.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "sb0400.h"
-const device_type SB0400 = &device_creator<sb0400_device>;
+const device_type SB0400 = device_creator<sb0400_device>;
DEVICE_ADDRESS_MAP_START(map, 32, sb0400_device)
ADDRESS_MAP_END
diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp
index faf02ccf6a1..41bcaf13c8d 100644
--- a/src/devices/sound/scsp.cpp
+++ b/src/devices/sound/scsp.cpp
@@ -141,7 +141,7 @@ static const double DRTimes[64]={100000/*infinity*/,100000/*infinity*/,118200.0,
static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f,0.0f};
-const device_type SCSP = &device_creator<scsp_device>;
+const device_type SCSP = device_creator<scsp_device>;
scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SCSP, "SCSP", tag, owner, clock, "scsp", __FILE__),
diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp
index a8be5c3a351..9068dd262d0 100644
--- a/src/devices/sound/segapcm.cpp
+++ b/src/devices/sound/segapcm.cpp
@@ -9,7 +9,7 @@
// device type definition
-const device_type SEGAPCM = &device_creator<segapcm_device>;
+const device_type SEGAPCM = device_creator<segapcm_device>;
//-------------------------------------------------
diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp
index d6a9ebbe35e..c7c1e0596b2 100644
--- a/src/devices/sound/sn76477.cpp
+++ b/src/devices/sound/sn76477.cpp
@@ -140,7 +140,7 @@ static const double out_neg_gain[] =
};
-const device_type SN76477 = &device_creator<sn76477_device>;
+const device_type SN76477 = device_creator<sn76477_device>;
sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SN76477, "SN76477", tag, owner, clock, "sn76477", __FILE__),
diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp
index 59b63f7e7ec..c60b587f3a5 100644
--- a/src/devices/sound/sn76496.cpp
+++ b/src/devices/sound/sn76496.cpp
@@ -434,13 +434,13 @@ void sn76496_base_device::register_for_save_states()
// save_item(NAME(m_sega_style_psg));
}
-const device_type SN76496 = &device_creator<sn76496_device>;
-const device_type U8106 = &device_creator<u8106_device>;
-const device_type Y2404 = &device_creator<y2404_device>;
-const device_type SN76489 = &device_creator<sn76489_device>;
-const device_type SN76489A = &device_creator<sn76489a_device>;
-const device_type SN76494 = &device_creator<sn76494_device>;
-const device_type SN94624 = &device_creator<sn94624_device>;
-const device_type NCR7496 = &device_creator<ncr7496_device>;
-const device_type GAMEGEAR = &device_creator<gamegear_device>;
-const device_type SEGAPSG = &device_creator<segapsg_device>;
+const device_type SN76496 = device_creator<sn76496_device>;
+const device_type U8106 = device_creator<u8106_device>;
+const device_type Y2404 = device_creator<y2404_device>;
+const device_type SN76489 = device_creator<sn76489_device>;
+const device_type SN76489A = device_creator<sn76489a_device>;
+const device_type SN76494 = device_creator<sn76494_device>;
+const device_type SN94624 = device_creator<sn94624_device>;
+const device_type NCR7496 = device_creator<ncr7496_device>;
+const device_type GAMEGEAR = device_creator<gamegear_device>;
+const device_type SEGAPSG = device_creator<segapsg_device>;
diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp
index a682dbe2bbd..c7b4ff4ef5a 100644
--- a/src/devices/sound/snkwave.cpp
+++ b/src/devices/sound/snkwave.cpp
@@ -15,7 +15,7 @@
#define CLOCK_SHIFT 8
-const device_type SNKWAVE = &device_creator<snkwave_device>;
+const device_type SNKWAVE = device_creator<snkwave_device>;
//-------------------------------------------------
// snkwave_device - constructor
diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp
index 6f33d6bdfa0..e4dcd28249d 100644
--- a/src/devices/sound/sp0250.cpp
+++ b/src/devices/sound/sp0250.cpp
@@ -34,7 +34,7 @@ should be 312, but 312 = 39*8 so it doesn't look right because a divider by 39 i
*/
#define CLOCK_DIVIDER (7*6*8)
-const device_type SP0250 = &device_creator<sp0250_device>;
+const device_type SP0250 = device_creator<sp0250_device>;
sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SP0250, "SP0250", tag, owner, clock, "sp0250", __FILE__),
diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp
index c735fafaa3b..5e8777e8de2 100644
--- a/src/devices/sound/sp0256.cpp
+++ b/src/devices/sound/sp0256.cpp
@@ -75,7 +75,7 @@ static const int16_t qtbl[128] =
// device type definition
-const device_type SP0256 = &device_creator<sp0256_device>;
+const device_type SP0256 = device_creator<sp0256_device>;
//**************************************************************************
diff --git a/src/devices/sound/speaker.cpp b/src/devices/sound/spkrdev.cpp
index e69e168ea0d..4af44791921 100644
--- a/src/devices/sound/speaker.cpp
+++ b/src/devices/sound/spkrdev.cpp
@@ -73,7 +73,8 @@
*/
#include "emu.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+
static const int16_t default_levels[2] = {0, 32767};
@@ -81,17 +82,17 @@ static const int16_t default_levels[2] = {0, 32767};
static const int RATE_MULTIPLIER = 4;
-const device_type SPEAKER_SOUND = &device_creator<speaker_sound_device>;
+const device_type SPEAKER_SOUND = device_creator<speaker_sound_device>;
template class device_finder<speaker_sound_device, false>;
template class device_finder<speaker_sound_device, true>;
speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_num_levels(2),
- m_levels(default_levels)
+ : device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__)
+ , device_sound_interface(mconfig, *this)
+ , m_num_levels(2)
+ , m_levels(default_levels)
{
}
diff --git a/src/devices/sound/speaker.h b/src/devices/sound/spkrdev.h
index 279cfd74e01..4fdb0a92ff6 100644
--- a/src/devices/sound/speaker.h
+++ b/src/devices/sound/spkrdev.h
@@ -7,8 +7,8 @@
driven by one or more output bits
**********************************************************************/
-#ifndef MAME_DEVICES_SOUND_SPEAKER_H
-#define MAME_DEVICES_SOUND_SPEAKER_H
+#ifndef MAME_DEVICES_SOUND_SPKRDEV_H
+#define MAME_DEVICES_SOUND_SPKRDEV_H
#pragma once
@@ -92,4 +92,4 @@ extern const device_type SPEAKER_SOUND;
extern template class device_finder<speaker_sound_device, false>;
extern template class device_finder<speaker_sound_device, true>;
-#endif // MAME_DEVICES_SOUND_SPEAKER_H
+#endif // MAME_DEVICES_SOUND_SPKRDEV_H
diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp
index a222a5626de..755717f1fc9 100644
--- a/src/devices/sound/spu.cpp
+++ b/src/devices/sound/spu.cpp
@@ -34,7 +34,7 @@
#endif
// device type definition
-const device_type SPU = &device_creator<spu_device>;
+const device_type SPU = device_creator<spu_device>;
//
//
diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp
index e4bfdadd959..9f186fa03e0 100644
--- a/src/devices/sound/st0016.cpp
+++ b/src/devices/sound/st0016.cpp
@@ -13,7 +13,7 @@
// device type definition
-const device_type ST0016 = &device_creator<st0016_device>;
+const device_type ST0016 = device_creator<st0016_device>;
//**************************************************************************
diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp
index 2eb5cd313d3..4cf3d2914c2 100644
--- a/src/devices/sound/t6721a.cpp
+++ b/src/devices/sound/t6721a.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type T6721A = &device_creator<t6721a_device>;
+const device_type T6721A = device_creator<t6721a_device>;
diff --git a/src/devices/sound/t6w28.cpp b/src/devices/sound/t6w28.cpp
index 4dc7174b99a..ffc966d0720 100644
--- a/src/devices/sound/t6w28.cpp
+++ b/src/devices/sound/t6w28.cpp
@@ -347,7 +347,7 @@ void t6w28_device::set_enable(bool enable)
m_enabled = enable;
}
-const device_type T6W28 = &device_creator<t6w28_device>;
+const device_type T6W28 = device_creator<t6w28_device>;
t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, T6W28, "T6W28", tag, owner, clock, "t6w28", __FILE__),
diff --git a/src/devices/sound/tc8830f.cpp b/src/devices/sound/tc8830f.cpp
index 2c862824d29..7a997d9d19f 100644
--- a/src/devices/sound/tc8830f.cpp
+++ b/src/devices/sound/tc8830f.cpp
@@ -22,7 +22,7 @@
// device type definition
-const device_type TC8830F = &device_creator<tc8830f_device>;
+const device_type TC8830F = device_creator<tc8830f_device>;
tc8830f_device::tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TC8830F, "TC8830F", tag, owner, clock, "tc8830f", __FILE__),
diff --git a/src/devices/sound/tiaintf.cpp b/src/devices/sound/tiaintf.cpp
index f2158d8941b..ea473c535c0 100644
--- a/src/devices/sound/tiaintf.cpp
+++ b/src/devices/sound/tiaintf.cpp
@@ -5,7 +5,7 @@
#include "tiasound.h"
// device type definition
-const device_type TIA = &device_creator<tia_device>;
+const device_type TIA = device_creator<tia_device>;
//**************************************************************************
diff --git a/src/devices/sound/tms3615.cpp b/src/devices/sound/tms3615.cpp
index ae39d751db6..5d9eac4e41e 100644
--- a/src/devices/sound/tms3615.cpp
+++ b/src/devices/sound/tms3615.cpp
@@ -10,7 +10,7 @@ static const int divisor[TMS3615_TONES] = { 478, 451, 426, 402, 379, 358, 338, 3
// device type definition
-const device_type TMS3615 = &device_creator<tms3615_device>;
+const device_type TMS3615 = device_creator<tms3615_device>;
//**************************************************************************
diff --git a/src/devices/sound/tms36xx.cpp b/src/devices/sound/tms36xx.cpp
index 5f1a8db2def..5375117b444 100644
--- a/src/devices/sound/tms36xx.cpp
+++ b/src/devices/sound/tms36xx.cpp
@@ -309,7 +309,7 @@ static const int *const tunes[] = {nullptr,tune1,tune2,tune3,tune4};
// device type definition
-const device_type TMS36XX = &device_creator<tms36xx_device>;
+const device_type TMS36XX = device_creator<tms36xx_device>;
//**************************************************************************
diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp
index 84e36322477..74ba519d649 100644
--- a/src/devices/sound/tms5110.cpp
+++ b/src/devices/sound/tms5110.cpp
@@ -1521,7 +1521,7 @@ WRITE_LINE_MEMBER( tmsprom_device::enable_w )
TMS 5110 device definition
-------------------------------------------------*/
-const device_type TMS5110 = &device_creator<tms5110_device>;
+const device_type TMS5110 = device_creator<tms5110_device>;
tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__)
@@ -1541,56 +1541,56 @@ tms5110_device::tms5110_device(const machine_config &mconfig, device_type type,
}
-const device_type TMS5100 = &device_creator<tms5100_device>;
+const device_type TMS5100 = device_creator<tms5100_device>;
tms5100_device::tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMS5100, "TMS5100", tag, owner, clock, "tms5100", __FILE__)
{
}
-const device_type TMC0281 = &device_creator<tmc0281_device>;
+const device_type TMC0281 = device_creator<tmc0281_device>;
tmc0281_device::tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMC0281, "TMC0281", tag, owner, clock, "tmc0281", __FILE__)
{
}
-const device_type TMS5100A = &device_creator<tms5100a_device>;
+const device_type TMS5100A = device_creator<tms5100a_device>;
tms5100a_device::tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMS5100A, "TMS5100A", tag, owner, clock, "tms5100a", __FILE__)
{
}
-const device_type TMC0281D = &device_creator<tmc0281d_device>;
+const device_type TMC0281D = device_creator<tmc0281d_device>;
tmc0281d_device::tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMC0281D, "TMC0281D", tag, owner, clock, "tmc0281d", __FILE__)
{
}
-const device_type CD2801 = &device_creator<cd2801_device>;
+const device_type CD2801 = device_creator<cd2801_device>;
cd2801_device::cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, CD2801, "CD2801", tag, owner, clock, "cd2801", __FILE__)
{
}
-const device_type CD2802 = &device_creator<cd2802_device>;
+const device_type CD2802 = device_creator<cd2802_device>;
cd2802_device::cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, CD2802, "CD2802", tag, owner, clock, "cd2802", __FILE__)
{
}
-const device_type TMS5110A = &device_creator<tms5110a_device>;
+const device_type TMS5110A = device_creator<tms5110a_device>;
tms5110a_device::tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, TMS5110A, "TMS5110A", tag, owner, clock, "tms5110a", __FILE__)
{
}
-const device_type M58817 = &device_creator<m58817_device>;
+const device_type M58817 = device_creator<m58817_device>;
m58817_device::m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5110_device(mconfig, M58817, "M58817", tag, owner, clock, "m58817", __FILE__)
@@ -1598,7 +1598,7 @@ m58817_device::m58817_device(const machine_config &mconfig, const char *tag, dev
}
-const device_type TMSPROM = &device_creator<tmsprom_device>;
+const device_type TMSPROM = device_creator<tmsprom_device>;
tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TMSPROM, "TMSPROM", tag, owner, clock, "tmsprom", __FILE__),
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index f20b7c2f90b..bf9c782d1e9 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -2169,7 +2169,7 @@ void tms5220_device::set_frequency(int frequency)
m_clock = frequency;
}
-const device_type TMS5220C = &device_creator<tms5220c_device>;
+const device_type TMS5220C = device_creator<tms5220c_device>;
tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__)
@@ -2177,7 +2177,7 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag,
}
-const device_type TMS5220 = &device_creator<tms5220_device>;
+const device_type TMS5220 = device_creator<tms5220_device>;
tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock, "tms5220", __FILE__),
@@ -2208,7 +2208,7 @@ tms5220_device::tms5220_device(const machine_config &mconfig, device_type type,
}
-const device_type CD2501E = &device_creator<cd2501e_device>;
+const device_type CD2501E = device_creator<cd2501e_device>;
cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__)
@@ -2216,7 +2216,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, d
}
-const device_type TMS5200 = &device_creator<tms5200_device>;
+const device_type TMS5200 = device_creator<tms5200_device>;
tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__)
@@ -2224,7 +2224,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, d
}
-const device_type CD2501ECD = &device_creator<cd2501ecd_device>;
+const device_type CD2501ECD = device_creator<cd2501ecd_device>;
cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms5220_device(mconfig, CD2501ECD, "CD2501ECD", tag, owner, clock, "cd2501ecd", __FILE__)
diff --git a/src/devices/sound/upd1771.cpp b/src/devices/sound/upd1771.cpp
index 57aa4faa4dc..0e24aedbe26 100644
--- a/src/devices/sound/upd1771.cpp
+++ b/src/devices/sound/upd1771.cpp
@@ -230,7 +230,7 @@ static unsigned char noise_tbl[]=
#define STATE_ADPCM 3
-const device_type UPD1771C = &device_creator<upd1771c_device>;
+const device_type UPD1771C = device_creator<upd1771c_device>;
upd1771c_device::upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp
index ccdb6c490d1..33554e5a1b8 100644
--- a/src/devices/sound/upd7752.cpp
+++ b/src/devices/sound/upd7752.cpp
@@ -18,7 +18,7 @@ skeleton device
//**************************************************************************
// device type definition
-const device_type UPD7752 = &device_creator<upd7752_device>;
+const device_type UPD7752 = device_creator<upd7752_device>;
/* TODO: unknown exact size */
static ADDRESS_MAP_START( upd7752_ram, AS_0, 8, upd7752_device )
diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp
index aedd8dd1331..e1b8dd88ad6 100644
--- a/src/devices/sound/upd7759.cpp
+++ b/src/devices/sound/upd7759.cpp
@@ -179,7 +179,7 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type,
{
}
-const device_type UPD7759 = &device_creator<upd7759_device>;
+const device_type UPD7759 = device_creator<upd7759_device>;
upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: upd775x_device(mconfig, UPD7759, "uPD7759", tag, owner, clock, "upd7759", __FILE__)
@@ -195,7 +195,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, device_type type,
}
-const device_type UPD7756 = &device_creator<upd7756_device>;
+const device_type UPD7756 = device_creator<upd7756_device>;
upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: upd775x_device(mconfig, UPD7756, "uPD7756", tag, owner, clock, "upd7756", __FILE__)
diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp
index a982965186e..22628afeae3 100644
--- a/src/devices/sound/vlm5030.cpp
+++ b/src/devices/sound/vlm5030.cpp
@@ -157,7 +157,7 @@ static const int vlm5030_speed_table[8] =
IP_SIZE_SLOW
};
-const device_type VLM5030 = &device_creator<vlm5030_device>;
+const device_type VLM5030 = device_creator<vlm5030_device>;
vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VLM5030, "VLM5030", tag, owner, clock, "vlm5030", __FILE__),
diff --git a/src/devices/sound/volt_reg.cpp b/src/devices/sound/volt_reg.cpp
index 82065a72568..6e179599907 100644
--- a/src/devices/sound/volt_reg.cpp
+++ b/src/devices/sound/volt_reg.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "volt_reg.h"
-const device_type VOLTAGE_REGULATOR = &device_creator<voltage_regulator_device>;
+const device_type VOLTAGE_REGULATOR = device_creator<voltage_regulator_device>;
voltage_regulator_device::voltage_regulator_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VOLTAGE_REGULATOR, "Voltage Regulator", tag, owner, clock, "volt_reg", __FILE__),
diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp
index bde5fbd6086..1068554aab3 100644
--- a/src/devices/sound/votrax.cpp
+++ b/src/devices/sound/votrax.cpp
@@ -26,7 +26,7 @@ tp1 = phi clock (tied to f2q rom access)
#include "votrax.h"
-const device_type VOTRAX_SC01 = &device_creator<votrax_sc01_device>;
+const device_type VOTRAX_SC01 = device_creator<votrax_sc01_device>;
// ROM definition for the Votrax phone ROM
ROM_START( votrax_sc01 )
diff --git a/src/devices/sound/vrc6.cpp b/src/devices/sound/vrc6.cpp
index 267477b751c..a377e736301 100644
--- a/src/devices/sound/vrc6.cpp
+++ b/src/devices/sound/vrc6.cpp
@@ -19,7 +19,7 @@
#define DISABLE_VRC6_SOUND // not ready yet
// device type definition
-const device_type VRC6 = &device_creator<vrc6snd_device>;
+const device_type VRC6 = device_creator<vrc6snd_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp
index 76f186e4b52..4968376dff5 100644
--- a/src/devices/sound/vrender0.cpp
+++ b/src/devices/sound/vrender0.cpp
@@ -77,7 +77,7 @@ static const unsigned short ULawTo16[]=
// LIVE DEVICE
//**************************************************************************
-const device_type VRENDER0 = &device_creator<vrender0_device>;
+const device_type VRENDER0 = device_creator<vrender0_device>;
//-------------------------------------------------
// vrender0_device - constructor
diff --git a/src/devices/sound/wave.cpp b/src/devices/sound/wave.cpp
index ac1d4036948..8515ec5237f 100644
--- a/src/devices/sound/wave.cpp
+++ b/src/devices/sound/wave.cpp
@@ -18,6 +18,9 @@
#include "emu.h"
#include "wave.h"
+#include "speaker.h"
+
+
#define ALWAYS_PLAY_SOUND 0
@@ -28,7 +31,7 @@ void wave_device::static_set_cassette_tag(device_t &device, const char *cassette
wave.m_cassette_tag = cassette_tag;
}
-const device_type WAVE = &device_creator<wave_device>;
+const device_type WAVE = device_creator<wave_device>;
wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wave", __FILE__),
diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp
index 377a229e0cb..bbaff50d15d 100644
--- a/src/devices/sound/x1_010.cpp
+++ b/src/devices/sound/x1_010.cpp
@@ -83,7 +83,7 @@ struct X1_010_CHANNEL {
//static short *mixer_buffer = nullptr;
-const device_type X1_010 = &device_creator<x1_010_device>;
+const device_type X1_010 = device_creator<x1_010_device>;
x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__),
diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp
index bc6e57cb7ea..b35787d0d1d 100644
--- a/src/devices/sound/ym2151.cpp
+++ b/src/devices/sound/ym2151.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "ym2151.h"
-const device_type YM2151 = &device_creator<ym2151_device>;
+const device_type YM2151 = device_creator<ym2151_device>;
#define FREQ_SH 16 /* 16.16 fixed point (frequency calculations) */
diff --git a/src/devices/sound/ym2413.cpp b/src/devices/sound/ym2413.cpp
index aa3aba490cb..76fcb144df0 100644
--- a/src/devices/sound/ym2413.cpp
+++ b/src/devices/sound/ym2413.cpp
@@ -1675,7 +1675,7 @@ WRITE8_MEMBER( ym2413_device::data_port_w )
write_reg(address, data);
}
-const device_type YM2413 = &device_creator<ym2413_device>;
+const device_type YM2413 = device_creator<ym2413_device>;
ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YM2413, "YM2413", tag, owner, clock, "ym2413", __FILE__),
diff --git a/src/devices/sound/ymf271.cpp b/src/devices/sound/ymf271.cpp
index 0062e429ee8..74ac30f0ca6 100644
--- a/src/devices/sound/ymf271.cpp
+++ b/src/devices/sound/ymf271.cpp
@@ -1744,7 +1744,7 @@ void ymf271_device::device_reset()
m_irq_handler(0);
}
-const device_type YMF271 = &device_creator<ymf271_device>;
+const device_type YMF271 = device_creator<ymf271_device>;
ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__)
diff --git a/src/devices/sound/ymf278b.cpp b/src/devices/sound/ymf278b.cpp
index 57084565fb0..a57f006d06c 100644
--- a/src/devices/sound/ymf278b.cpp
+++ b/src/devices/sound/ymf278b.cpp
@@ -1025,7 +1025,7 @@ void ymf278b_device::device_start()
}
-const device_type YMF278B = &device_creator<ymf278b_device>;
+const device_type YMF278B = device_creator<ymf278b_device>;
ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YMF278B, "YMF278B", tag, owner, clock, "ymf278b", __FILE__),
diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp
index 4dde3676fce..40e9578557f 100644
--- a/src/devices/sound/ymz280b.cpp
+++ b/src/devices/sound/ymz280b.cpp
@@ -940,7 +940,7 @@ WRITE8_MEMBER( ymz280b_device::write )
}
-const device_type YMZ280B = &device_creator<ymz280b_device>;
+const device_type YMZ280B = device_creator<ymz280b_device>;
ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, YMZ280B, "YMZ280B", tag, owner, clock, "ymz280b", __FILE__),
diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp
index b30c3c1c783..5bdb7e9a89d 100644
--- a/src/devices/sound/ymz770.cpp
+++ b/src/devices/sound/ymz770.cpp
@@ -24,7 +24,7 @@ TODO:
#include "mpeg_audio.h"
// device type definition
-const device_type YMZ770 = &device_creator<ymz770_device>;
+const device_type YMZ770 = device_creator<ymz770_device>;
//-------------------------------------------------
// ymz770_device - constructor
diff --git a/src/devices/sound/zsg2.cpp b/src/devices/sound/zsg2.cpp
index c767c6a042e..9cef9c598b3 100644
--- a/src/devices/sound/zsg2.cpp
+++ b/src/devices/sound/zsg2.cpp
@@ -59,7 +59,7 @@ TODO:
// device type definition
-const device_type ZSG2 = &device_creator<zsg2_device>;
+const device_type ZSG2 = device_creator<zsg2_device>;
//-------------------------------------------------
// zsg2_device - constructor
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp
index eb6985203e2..82f8c038921 100644
--- a/src/devices/video/315_5124.cpp
+++ b/src/devices/video/315_5124.cpp
@@ -105,9 +105,9 @@ static const uint8_t pal_224[6] = { 3, 13, 38, 224, 32, 3 };
static const uint8_t pal_240[6] = { 3, 13, 30, 240, 24, 3 };
-const device_type SEGA315_5124 = &device_creator<sega315_5124_device>;
-const device_type SEGA315_5246 = &device_creator<sega315_5246_device>;
-const device_type SEGA315_5378 = &device_creator<sega315_5378_device>;
+const device_type SEGA315_5124 = device_creator<sega315_5124_device>;
+const device_type SEGA315_5246 = device_creator<sega315_5246_device>;
+const device_type SEGA315_5378 = device_creator<sega315_5378_device>;
PALETTE_INIT_MEMBER(sega315_5124_device, sega315_5124)
diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h
index 7cc8cdaf642..e3ab1f23559 100644
--- a/src/devices/video/315_5124.h
+++ b/src/devices/video/315_5124.h
@@ -8,8 +8,12 @@
**************************************************************************/
-#ifndef __SEGA315_5124_H__
-#define __SEGA315_5124_H__
+#ifndef MAME_DEVICES_VIDEO_315_5124_H
+#define MAME_DEVICES_VIDEO_315_5124_H
+
+#pragma once
+
+#include "screen.h"
/***************************************************************************
@@ -263,4 +267,4 @@ protected:
devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB_##_devcb);
-#endif /* __SEGA315_5124_H__ */
+#endif // MAME_DEVICES_VIDEO_315_5124_H
diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp
index 520c2c45980..c6f9e28e456 100644
--- a/src/devices/video/315_5313.cpp
+++ b/src/devices/video/315_5313.cpp
@@ -12,7 +12,7 @@
#define MAX_HPOSITION 480
-const device_type SEGA315_5313 = &device_creator<sega315_5313_device>;
+const device_type SEGA315_5313 = device_creator<sega315_5313_device>;
sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega315_5124_device(mconfig, SEGA315_5313, "Sega 315-5313 Megadrive VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5313", __FILE__), m_render_bitmap(nullptr),
diff --git a/src/devices/video/bufsprite.cpp b/src/devices/video/bufsprite.cpp
index bc9717d8ef7..4a3e4033d63 100644
--- a/src/devices/video/bufsprite.cpp
+++ b/src/devices/video/bufsprite.cpp
@@ -17,7 +17,7 @@
//**************************************************************************
// device type definition
-extern const device_type BUFFERED_SPRITERAM8 = &device_creator<buffered_spriteram8_device>;
-extern const device_type BUFFERED_SPRITERAM16 = &device_creator<buffered_spriteram16_device>;
-extern const device_type BUFFERED_SPRITERAM32 = &device_creator<buffered_spriteram32_device>;
-extern const device_type BUFFERED_SPRITERAM64 = &device_creator<buffered_spriteram64_device>;
+const device_type BUFFERED_SPRITERAM8 = device_creator<buffered_spriteram8_device>;
+const device_type BUFFERED_SPRITERAM16 = device_creator<buffered_spriteram16_device>;
+const device_type BUFFERED_SPRITERAM32 = device_creator<buffered_spriteram32_device>;
+const device_type BUFFERED_SPRITERAM64 = device_creator<buffered_spriteram64_device>;
diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp
index 804cabf87e4..9e3723bdfdd 100644
--- a/src/devices/video/cdp1861.cpp
+++ b/src/devices/video/cdp1861.cpp
@@ -26,7 +26,7 @@
//**************************************************************************
// device type definition
-const device_type CDP1861 = &device_creator<cdp1861_device>;
+const device_type CDP1861 = device_creator<cdp1861_device>;
diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h
index b72b47a3042..c925583d853 100644
--- a/src/devices/video/cdp1861.h
+++ b/src/devices/video/cdp1861.h
@@ -21,12 +21,12 @@
**********************************************************************/
-#pragma once
-
-#ifndef __CDP1861__
-#define __CDP1861__
+#ifndef MAME_DEVICES_VIDEO_CDP1861_H
+#define MAME_DEVICES_VIDEO_CDP1861_H
+#pragma once
+#include "screen.h"
//**************************************************************************
@@ -140,5 +140,4 @@ private:
extern const device_type CDP1861;
-
-#endif
+#endif // MAME_DEVICES_VIDEO_CDP1861_H
diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp
index ab79e3998dd..4d7525195c0 100644
--- a/src/devices/video/cdp1862.cpp
+++ b/src/devices/video/cdp1862.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "cdp1862.h"
+#include "screen.h"
+
//**************************************************************************
@@ -24,7 +26,7 @@ static const int CDP1862_BACKGROUND_COLOR_SEQUENCE[] = { 2, 0, 1, 4 };
//**************************************************************************
// device type definition
-const device_type CDP1862 = &device_creator<cdp1862_device>;
+const device_type CDP1862 = device_creator<cdp1862_device>;
diff --git a/src/devices/video/cesblit.cpp b/src/devices/video/cesblit.cpp
index fd7ad41ee25..330abce1b66 100644
--- a/src/devices/video/cesblit.cpp
+++ b/src/devices/video/cesblit.cpp
@@ -52,12 +52,15 @@
#include "emu.h"
#include "cesblit.h"
+#include "screen.h"
+
+
/***************************************************************************
GLOBAL VARIABLES
***************************************************************************/
// device type definition
-const device_type CESBLIT = &device_creator<cesblit_device>;
+const device_type CESBLIT = device_creator<cesblit_device>;
/***************************************************************************
LIVE DEVICE
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index f03e418e8e7..e1e6060f7c0 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -9,6 +9,9 @@
#include "emu.h"
#include "clgd542x.h"
+#include "screen.h"
+
+
#define LOG_REG 0
#define LOG_BLIT 1
@@ -38,12 +41,12 @@
#define TEXT_COPY_9COLUMN(ch) (((ch & 0xe0) == 0xc0)&&(vga.attribute.data[0x10]&4))
-const device_type CIRRUS_GD5428 = &device_creator<cirrus_gd5428_device>;
-const device_type CIRRUS_GD5430 = &device_creator<cirrus_gd5430_device>;
+const device_type CIRRUS_GD5428 = device_creator<cirrus_gd5428_device>;
+const device_type CIRRUS_GD5430 = device_creator<cirrus_gd5430_device>;
cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : svga_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__)
+ : cirrus_gd5428_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__)
{
}
diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp
index 1992a369df9..90eb521ffc2 100644
--- a/src/devices/video/crt9007.cpp
+++ b/src/devices/video/crt9007.cpp
@@ -34,13 +34,15 @@
#include "emu.h"
#include "crt9007.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CRT9007 = &device_creator<crt9007_t>;
+const device_type CRT9007 = device_creator<crt9007_t>;
diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp
index 17f379d560c..b34ed316bd4 100644
--- a/src/devices/video/crt9021.cpp
+++ b/src/devices/video/crt9021.cpp
@@ -36,12 +36,14 @@
#include "emu.h"
#include "crt9021.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CRT9021 = &device_creator<crt9021_t>;
+const device_type CRT9021 = device_creator<crt9021_t>;
diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp
index 09c8cbb68aa..922826f37ff 100644
--- a/src/devices/video/crt9212.cpp
+++ b/src/devices/video/crt9212.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CRT9212 = &device_creator<crt9212_t>;
+const device_type CRT9212 = device_creator<crt9212_t>;
diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp
index eab4c2c5bfe..f993d883047 100644
--- a/src/devices/video/crtc_ega.cpp
+++ b/src/devices/video/crtc_ega.cpp
@@ -11,27 +11,36 @@
#include "emu.h"
#include "crtc_ega.h"
+#include "screen.h"
+
#define LOG (1)
-const device_type CRTC_EGA = &device_creator<crtc_ega_device>;
+const device_type CRTC_EGA = device_creator<crtc_ega_device>;
crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__),
- device_video_interface(mconfig, *this, false),
- m_res_out_de_cb(*this),
- m_res_out_hsync_cb(*this),
- m_res_out_vsync_cb(*this),
- m_res_out_vblank_cb(*this), m_horiz_char_total(0), m_horiz_disp(0), m_horiz_blank_start(0), m_horiz_blank_end(0), m_ena_vert_access(0), m_de_skew(0), m_horiz_retr_start(0), m_horiz_retr_end(0),
- m_horiz_retr_skew(0), m_vert_total(0), m_preset_row_scan(0), m_byte_panning(0), m_max_ras_addr(0), m_scan_doubling(0), m_cursor_start_ras(0), m_cursor_disable(0), m_cursor_end_ras(0), m_cursor_skew(0),
- m_disp_start_addr(0), m_cursor_addr(0), m_light_pen_addr(0), m_vert_retr_start(0), m_vert_retr_end(0), m_protect(0), m_bandwidth(0), m_vert_disp_end(0), m_offset(0), m_underline_loc(0), m_vert_blank_start(0),
- m_vert_blank_end(0), m_mode_control(0), m_line_compare(0), m_register_address_latch(0), m_cursor_state(false), m_cursor_blink_count(0),
- m_hpixels_per_column(0), m_cur(0), m_hsync(0), m_vsync(0), m_vblank(0), m_de(0), m_character_counter(0), m_hsync_width_counter(0), m_line_counter(0), m_raster_counter(0), m_vsync_width_counter(0),
- m_line_enable_ff(false), m_vsync_ff(0), m_adjust_active(0), m_line_address(0), m_cursor_x(0), m_line_timer(nullptr), m_de_off_timer(nullptr), m_cur_on_timer(nullptr), m_cur_off_timer(nullptr),
- m_hsync_on_timer(nullptr), m_hsync_off_timer(nullptr), m_light_pen_latch_timer(nullptr), m_horiz_pix_total(0), m_vert_pix_total(0), m_max_visible_x(0), m_max_visible_y(0), m_hsync_on_pos(0),
- m_hsync_off_pos(0), m_vsync_on_pos(0), m_vsync_off_pos(0), m_current_disp_addr(0), m_light_pen_latched(0), m_has_valid_parameters(false)
+ : device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__), device_video_interface(mconfig, *this, false)
+ , m_res_out_de_cb(*this), m_res_out_hsync_cb(*this), m_res_out_vsync_cb(*this), m_res_out_vblank_cb(*this)
+ , m_horiz_char_total(0), m_horiz_disp(0), m_horiz_blank_start(0), m_horiz_blank_end(0)
+ , m_ena_vert_access(0), m_de_skew(0)
+ , m_horiz_retr_start(0), m_horiz_retr_end(0), m_horiz_retr_skew(0)
+ , m_vert_total(0), m_preset_row_scan(0), m_byte_panning(0), m_max_ras_addr(0), m_scan_doubling(0)
+ , m_cursor_start_ras(0), m_cursor_disable(0), m_cursor_end_ras(0), m_cursor_skew(0)
+ , m_disp_start_addr(0), m_cursor_addr(0), m_light_pen_addr(0)
+ , m_vert_retr_start(0), m_vert_retr_end(0)
+ , m_protect(0), m_bandwidth(0), m_vert_disp_end(0), m_offset(0), m_underline_loc(0)
+ , m_vert_blank_start(0), m_vert_blank_end(0)
+ , m_mode_control(0), m_line_compare(0), m_register_address_latch(0)
+ , m_cursor_state(false), m_cursor_blink_count(0)
+ , m_hpixels_per_column(0), m_cur(0), m_hsync(0), m_vsync(0), m_vblank(0), m_de(0)
+ , m_character_counter(0), m_hsync_width_counter(0), m_line_counter(0), m_raster_counter(0), m_vsync_width_counter(0)
+ , m_line_enable_ff(false), m_vsync_ff(0), m_adjust_active(0), m_line_address(0), m_cursor_x(0)
+ , m_line_timer(nullptr), m_de_off_timer(nullptr), m_cur_on_timer(nullptr), m_cur_off_timer(nullptr), m_hsync_on_timer(nullptr), m_hsync_off_timer(nullptr), m_light_pen_latch_timer(nullptr)
+ , m_horiz_pix_total(0), m_vert_pix_total(0), m_max_visible_x(0), m_max_visible_y(0)
+ , m_hsync_on_pos(0), m_hsync_off_pos(0), m_vsync_on_pos(0), m_vsync_off_pos(0)
+ , m_current_disp_addr(0), m_light_pen_latched(0), m_has_valid_parameters(false)
{
}
diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp
index 3925d9b9607..f79c33e9717 100644
--- a/src/devices/video/dl1416.cpp
+++ b/src/devices/video/dl1416.cpp
@@ -164,9 +164,9 @@ protected:
DEVICE TYPE GLOBALS
*****************************************************************************/
-device_type const DL1414T = &device_creator<dl1414t_device>;
-device_type const DL1416B = &device_creator<dl1416b_device>;
-device_type const DL1416T = &device_creator<dl1416t_device>;
+device_type const DL1414T = device_creator<dl1414t_device>;
+device_type const DL1416B = device_creator<dl1416b_device>;
+device_type const DL1416T = device_creator<dl1416t_device>;
diff --git a/src/devices/video/dm9368.cpp b/src/devices/video/dm9368.cpp
index 4b27a12da7d..8b06f49f81d 100644
--- a/src/devices/video/dm9368.cpp
+++ b/src/devices/video/dm9368.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITION
//**************************************************************************
-const device_type DM9368 = &device_creator<dm9368_device>;
+const device_type DM9368 = device_creator<dm9368_device>;
diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp
index c252e85aa46..8bc8838b592 100644
--- a/src/devices/video/ef9340_1.cpp
+++ b/src/devices/video/ef9340_1.cpp
@@ -13,9 +13,11 @@
#include "ef9340_1.h"
#include "ef9341_chargen.h"
+#include "screen.h"
+
// device type definition
-const device_type EF9340_1 = &device_creator<ef9340_1_device>;
+const device_type EF9340_1 = device_creator<ef9340_1_device>;
static const uint8_t bgr2rgb[8] =
diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp
index c8ff12252dd..ed3ec8adc3a 100644
--- a/src/devices/video/ef9345.cpp
+++ b/src/devices/video/ef9345.cpp
@@ -14,6 +14,9 @@
#include "emu.h"
#include "ef9345.h"
+#include "screen.h"
+
+
#define MODE24x40 0
#define MODEVAR40 1
#define MODE8x80 2
@@ -25,7 +28,7 @@
//**************************************************************************
// devices
-const device_type EF9345 = &device_creator<ef9345_device>;
+const device_type EF9345 = device_creator<ef9345_device>;
// default address map
static ADDRESS_MAP_START( ef9345, AS_0, 8, ef9345_device )
diff --git a/src/devices/video/ef9364.cpp b/src/devices/video/ef9364.cpp
index a228bb2cbec..6957a57d676 100644
--- a/src/devices/video/ef9364.cpp
+++ b/src/devices/video/ef9364.cpp
@@ -24,8 +24,11 @@
#include "emu.h"
#include "ef9364.h"
+#include "screen.h"
+
+
// devices
-const device_type EF9364 = &device_creator<ef9364_device>;
+const device_type EF9364 = device_creator<ef9364_device>;
//-------------------------------------------------
// default address map
diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp
index 90cc08e51fb..ee57644ccaa 100644
--- a/src/devices/video/ef9365.cpp
+++ b/src/devices/video/ef9365.cpp
@@ -67,6 +67,9 @@
#include "emu.h"
#include "ef9365.h"
+#include "screen.h"
+
+
#ifdef DBGMODE
//-------------------------------------------------
// Some debug mode const strings
@@ -122,7 +125,7 @@ const char * commands_names[]=
#endif
// devices
-const device_type EF9365 = &device_creator<ef9365_device>;
+const device_type EF9365 = device_creator<ef9365_device>;
ROM_START( ef9365 )
ROM_REGION( 0x1E0, "ef9365", 0 )
diff --git a/src/devices/video/ef9369.cpp b/src/devices/video/ef9369.cpp
index f6012ffe0f4..84d69c88117 100644
--- a/src/devices/video/ef9369.cpp
+++ b/src/devices/video/ef9369.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EF9369 = &device_creator<ef9369_device>;
+const device_type EF9369 = device_creator<ef9369_device>;
//**************************************************************************
diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp
index bcf4e04ab18..68d1098abd5 100644
--- a/src/devices/video/epic12.cpp
+++ b/src/devices/video/epic12.cpp
@@ -7,7 +7,7 @@
-const device_type EPIC12 = &device_creator<epic12_device>;
+const device_type EPIC12 = device_creator<epic12_device>;
epic12_device::epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, EPIC12, "EP1C12 Blitter", tag, owner, clock, "epic12", __FILE__),
diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp
index 486b8e909e3..88875b8eb67 100644
--- a/src/devices/video/fixfreq.cpp
+++ b/src/devices/video/fixfreq.cpp
@@ -31,7 +31,7 @@
***************************************************************************/
// device type definition
-const device_type FIXFREQ = &device_creator<fixedfreq_device>;
+const device_type FIXFREQ = device_creator<fixedfreq_device>;
fixedfreq_device::fixedfreq_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/video/fixfreq.h b/src/devices/video/fixfreq.h
index ed009275cae..080013ad1a6 100644
--- a/src/devices/video/fixfreq.h
+++ b/src/devices/video/fixfreq.h
@@ -11,10 +11,12 @@
***************************************************************************/
-#ifndef FIXFREQ_H
-#define FIXFREQ_H
+#ifndef MAME_DEVICES_VIDEO_FIXFREQ_H
+#define MAME_DEVICES_VIDEO_FIXFREQ_H
#include "machine/netlist.h"
+#include "screen.h"
+
#define FIXFREQ_INTERFACE(name) \
const fixedfreq_interface (name) =
@@ -156,4 +158,4 @@ private:
// device type definition
extern const device_type FIXFREQ;
-#endif /* FIXFREQ_H */
+#endif // MAME_DEVICES_VIDEO_FIXFREQ_H
diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp
index 6be32fc7588..8439f33fc94 100644
--- a/src/devices/video/gb_lcd.cpp
+++ b/src/devices/video/gb_lcd.cpp
@@ -158,6 +158,9 @@ TODO:
#include "emu.h"
#include "video/gb_lcd.h"
+#include "screen.h"
+
+
#define ENABLE_LOGGING 0
#define LOG(x) do { if (ENABLE_LOGGING) logerror x; } while(0)
@@ -309,10 +312,10 @@ static const uint8_t ags_oam_fingerprint[0x100] = {
#endif
-const device_type DMG_PPU = &device_creator<dmg_ppu_device>;
-const device_type MGB_PPU = &device_creator<mgb_ppu_device>;
-const device_type SGB_PPU = &device_creator<sgb_ppu_device>;
-const device_type CGB_PPU = &device_creator<cgb_ppu_device>;
+const device_type DMG_PPU = device_creator<dmg_ppu_device>;
+const device_type MGB_PPU = device_creator<mgb_ppu_device>;
+const device_type SGB_PPU = device_creator<sgb_ppu_device>;
+const device_type CGB_PPU = device_creator<cgb_ppu_device>;
diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp
index 398c8542673..71d094ae8cf 100644
--- a/src/devices/video/gba_lcd.cpp
+++ b/src/devices/video/gba_lcd.cpp
@@ -11,9 +11,11 @@
***************************************************************************/
#include "emu.h"
+#include "gba_lcd.h"
+
#include "rendlay.h"
+#include "screen.h"
-#include "gba_lcd.h"
/* LCD I/O Registers */
#define DISPCNT HWLO(0x000) /* 0x4000000 2 R/W LCD Control */
@@ -138,7 +140,7 @@ private:
uint16_t m_attr2;
};
-const device_type GBA_LCD = &device_creator<gba_lcd_device>;
+const device_type GBA_LCD = device_creator<gba_lcd_device>;
gba_lcd_device::gba_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GBA_LCD, "GBA LCD", tag, owner, clock, "gba_lcd", __FILE__)
diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp
index dd13c73a2cb..6b539cf65a3 100644
--- a/src/devices/video/gf4500.cpp
+++ b/src/devices/video/gf4500.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
#define GF4500_FRAMEBUF_OFFSET 0x20000
-const device_type GF4500 = &device_creator<gf4500_device>;
+const device_type GF4500 = device_creator<gf4500_device>;
gf4500_device::gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp
index dfb16de1a1e..4b35d3a8f97 100644
--- a/src/devices/video/gf7600gs.cpp
+++ b/src/devices/video/gf7600gs.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "gf7600gs.h"
-const device_type GEFORCE_7600GS = &device_creator<geforce_7600gs_device>;
+const device_type GEFORCE_7600GS = device_creator<geforce_7600gs_device>;
DEVICE_ADDRESS_MAP_START(map1, 32, geforce_7600gs_device)
ADDRESS_MAP_END
diff --git a/src/devices/video/hd44102.cpp b/src/devices/video/hd44102.cpp
index 6598cbceb10..00d2cf8d85d 100644
--- a/src/devices/video/hd44102.cpp
+++ b/src/devices/video/hd44102.cpp
@@ -34,7 +34,7 @@
// device type definition
-const device_type HD44102 = &device_creator<hd44102_device>;
+const device_type HD44102 = device_creator<hd44102_device>;
//**************************************************************************
diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp
index 381fab18967..55eef9b31a2 100644
--- a/src/devices/video/hd44352.cpp
+++ b/src/devices/video/hd44352.cpp
@@ -24,7 +24,7 @@
// devices
-const device_type HD44352 = &device_creator<hd44352_device>;
+const device_type HD44352 = device_creator<hd44352_device>;
//**************************************************************************
// live device
diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp
index 65aef6fc39a..41c05f3e5e4 100644
--- a/src/devices/video/hd44780.cpp
+++ b/src/devices/video/hd44780.cpp
@@ -19,8 +19,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HD44780 = &device_creator<hd44780_device>;
-const device_type KS0066_F05 = &device_creator<ks0066_f05_device>;
+const device_type HD44780 = device_creator<hd44780_device>;
+const device_type KS0066_F05 = device_creator<ks0066_f05_device>;
//-------------------------------------------------
diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp
index de9c58b0928..432f886c59b 100644
--- a/src/devices/video/hd61830.cpp
+++ b/src/devices/video/hd61830.cpp
@@ -9,14 +9,16 @@
#include "emu.h"
#include "hd61830.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type HD61830 = &device_creator<hd61830_device>;
-const device_type HD61830B = &device_creator<hd61830_device>;
+const device_type HD61830 = device_creator<hd61830_device>;
+const device_type HD61830B = device_creator<hd61830_device>;
// default address map
diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp
index fd37c54f702..06f7a1dc20c 100644
--- a/src/devices/video/hd63484.cpp
+++ b/src/devices/video/hd63484.cpp
@@ -12,6 +12,9 @@
#include "emu.h"
#include "hd63484.h"
+#include "screen.h"
+
+
#define LOG 0
#define FIFO_LOG 0
#define CMD_LOG 0
@@ -328,7 +331,7 @@ enum
-------------------------------------------------*/
// devices
-const device_type HD63484 = &device_creator<hd63484_device>;
+const device_type HD63484 = device_creator<hd63484_device>;
ROM_START( hd63484 )
diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp
index a3309276c0a..a19dc11c750 100644
--- a/src/devices/video/hd66421.cpp
+++ b/src/devices/video/hd66421.cpp
@@ -65,7 +65,7 @@
//**************************************************************************
// devices
-const device_type HD66421 = &device_creator<hd66421_device>;
+const device_type HD66421 = device_creator<hd66421_device>;
// default address map
diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp
index 7394fc60518..04bf4f72e60 100644
--- a/src/devices/video/hlcd0515.cpp
+++ b/src/devices/video/hlcd0515.cpp
@@ -17,8 +17,8 @@
#include "video/hlcd0515.h"
-const device_type HLCD0515 = &device_creator<hlcd0515_device>;
-const device_type HLCD0569 = &device_creator<hlcd0569_device>;
+const device_type HLCD0515 = device_creator<hlcd0515_device>;
+const device_type HLCD0569 = device_creator<hlcd0569_device>;
//-------------------------------------------------
// constructor
diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp
index 989875fd99d..e5a4d2438c1 100644
--- a/src/devices/video/huc6202.cpp
+++ b/src/devices/video/huc6202.cpp
@@ -11,7 +11,7 @@
#include "huc6202.h"
-const device_type HUC6202 = &device_creator<huc6202_device>;
+const device_type HUC6202 = device_creator<huc6202_device>;
huc6202_device::huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp
index 8a90b800bd9..1676924dee2 100644
--- a/src/devices/video/huc6260.cpp
+++ b/src/devices/video/huc6260.cpp
@@ -19,6 +19,9 @@
#include "emu.h"
#include "huc6260.h"
+#include "screen.h"
+
+
#define LOG 0
#define HUC6260_HSYNC_LENGTH 237
@@ -42,7 +45,7 @@ PALETTE_INIT_MEMBER(huc6260_device, huc6260)
}
-const device_type HUC6260 = &device_creator<huc6260_device>;
+const device_type HUC6260 = device_creator<huc6260_device>;
huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/huc6261.cpp b/src/devices/video/huc6261.cpp
index 43b4eada457..e9ca25d236d 100644
--- a/src/devices/video/huc6261.cpp
+++ b/src/devices/video/huc6261.cpp
@@ -16,13 +16,16 @@
#include "emu.h"
#include "huc6261.h"
+#include "screen.h"
+
+
#define LOG 0
#define HUC6261_HSYNC_LENGTH 237
#define HUC6261_HSYNC_START ( HUC6261_WPF - HUC6261_HSYNC_LENGTH )
-const device_type HUC6261 = &device_creator<huc6261_device>;
+const device_type HUC6261 = device_creator<huc6261_device>;
huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp
index a0ee56cf8e4..bf367eaa4eb 100644
--- a/src/devices/video/huc6270.cpp
+++ b/src/devices/video/huc6270.cpp
@@ -91,7 +91,7 @@ ALLOW_SAVE_TYPE(huc6270_device::huc6270_h_state);
#define HUC6270_CR 0x01 /* Set when sprite #0 overlaps with another sprite */
-const device_type HUC6270 = &device_creator<huc6270_device>;
+const device_type HUC6270 = device_creator<huc6270_device>;
const uint8_t huc6270_device::vram_increments[4] = { 1, 32, 64, 128 };
diff --git a/src/devices/video/huc6271.cpp b/src/devices/video/huc6271.cpp
index a383c0ac97a..b9379c9d6af 100644
--- a/src/devices/video/huc6271.cpp
+++ b/src/devices/video/huc6271.cpp
@@ -16,7 +16,7 @@
//**************************************************************************
// device type definition
-const device_type huc6271 = &device_creator<huc6271_device>;
+const device_type huc6271 = device_creator<huc6271_device>;
//**************************************************************************
diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp
index 5de6c67e2ec..af38859df0e 100644
--- a/src/devices/video/huc6272.cpp
+++ b/src/devices/video/huc6272.cpp
@@ -20,7 +20,7 @@
//**************************************************************************
// device type definition
-const device_type huc6272 = &device_creator<huc6272_device>;
+const device_type huc6272 = device_creator<huc6272_device>;
static ADDRESS_MAP_START( microprg_map, AS_PROGRAM, 16, huc6272_device )
AM_RANGE(0x00, 0x0f) AM_RAM AM_SHARE("microprg_ram")
diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp
index 81cab914fb6..bf1de11dcbb 100644
--- a/src/devices/video/i8244.cpp
+++ b/src/devices/video/i8244.cpp
@@ -12,10 +12,13 @@
#include "emu.h"
#include "i8244.h"
+#include "screen.h"
+
+
// device type definition
-const device_type I8244 = &device_creator<i8244_device>;
-const device_type I8245 = &device_creator<i8245_device>;
+const device_type I8244 = device_creator<i8244_device>;
+const device_type I8245 = device_creator<i8245_device>;
// Kevtris verified that the data below matches a dump
diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp
index 1e2db782a01..296dc0ef2d4 100644
--- a/src/devices/video/i82730.cpp
+++ b/src/devices/video/i82730.cpp
@@ -11,6 +11,8 @@
#include "emu.h"
#include "i82730.h"
+#include "screen.h"
+
//**************************************************************************
// CONSTANTS
@@ -25,7 +27,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I82730 = &device_creator<i82730_device>;
+const device_type I82730 = device_creator<i82730_device>;
const char *i82730_device::m_command_names[] =
{
diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp
index 0836fe74ea7..b2f7cfc8daf 100644
--- a/src/devices/video/i8275.cpp
+++ b/src/devices/video/i8275.cpp
@@ -17,6 +17,8 @@
#include "emu.h"
#include "i8275.h"
+#include "screen.h"
+
//**************************************************************************
@@ -80,7 +82,7 @@ const int i8275_device::character_attribute[3][16] =
//**************************************************************************
// device type definition
-const device_type I8275 = &device_creator<i8275_device>;
+const device_type I8275 = device_creator<i8275_device>;
diff --git a/src/devices/video/jangou_blitter.cpp b/src/devices/video/jangou_blitter.cpp
index 914c6b0e7ad..d7d446fb813 100644
--- a/src/devices/video/jangou_blitter.cpp
+++ b/src/devices/video/jangou_blitter.cpp
@@ -23,7 +23,7 @@
//**************************************************************************
// device type definition
-const device_type JANGOU_BLITTER = &device_creator<jangou_blitter_device>;
+const device_type JANGOU_BLITTER = device_creator<jangou_blitter_device>;
//**************************************************************************
diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp
index 44f92f0fd51..b8fa3984599 100644
--- a/src/devices/video/m50458.cpp
+++ b/src/devices/video/m50458.cpp
@@ -19,6 +19,7 @@
#include "emu.h"
#include "video/m50458.h"
+#include "screen.h"
//**************************************************************************
@@ -26,7 +27,7 @@
//**************************************************************************
// device type definition
-const device_type M50458 = &device_creator<m50458_device>;
+const device_type M50458 = device_creator<m50458_device>;
static ADDRESS_MAP_START( m50458_vram, AS_0, 16, m50458_device )
AM_RANGE(0x0000, 0x023f) AM_RAM // vram
diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp
index 8c9d2cf80be..d962d701fa4 100644
--- a/src/devices/video/mb90082.cpp
+++ b/src/devices/video/mb90082.cpp
@@ -21,7 +21,7 @@
//**************************************************************************
// device type definition
-const device_type MB90082 = &device_creator<mb90082_device>;
+const device_type MB90082 = device_creator<mb90082_device>;
static ADDRESS_MAP_START( mb90082_vram, AS_0, 16, mb90082_device )
AM_RANGE(0x0000, 0x023f) AM_RAM // main screen vram
diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp
index ae3c7c2b386..39ad396f185 100644
--- a/src/devices/video/mb_vcu.cpp
+++ b/src/devices/video/mb_vcu.cpp
@@ -30,7 +30,7 @@ TODO:
//**************************************************************************
// device type definition
-const device_type MB_VCU = &device_creator<mb_vcu_device>;
+const device_type MB_VCU = device_creator<mb_vcu_device>;
//-------------------------------------------------
// static_set_palette_tag: Set the tag of the
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index dcab1963fbe..add19de1f2b 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -41,23 +41,25 @@
#include "emu.h"
#include "mc6845.h"
+#include "screen.h"
+
#define LOG (0)
-const device_type MC6845 = &device_creator<mc6845_device>;
-const device_type MC6845_1 = &device_creator<mc6845_1_device>;
-const device_type R6545_1 = &device_creator<r6545_1_device>;
-const device_type C6545_1 = &device_creator<c6545_1_device>;
-const device_type H46505 = &device_creator<h46505_device>;
-const device_type HD6845 = &device_creator<hd6845_device>;
-const device_type SY6545_1 = &device_creator<sy6545_1_device>;
-const device_type SY6845E = &device_creator<sy6845e_device>;
-const device_type HD6345 = &device_creator<hd6345_device>;
-const device_type AMS40041 = &device_creator<ams40041_device>;
-const device_type AMS40489 = &device_creator<ams40489_device>;
-const device_type MOS8563 = &device_creator<mos8563_device>;
-const device_type MOS8568 = &device_creator<mos8568_device>;
+const device_type MC6845 = device_creator<mc6845_device>;
+const device_type MC6845_1 = device_creator<mc6845_1_device>;
+const device_type R6545_1 = device_creator<r6545_1_device>;
+const device_type C6545_1 = device_creator<c6545_1_device>;
+const device_type H46505 = device_creator<h46505_device>;
+const device_type HD6845 = device_creator<hd6845_device>;
+const device_type SY6545_1 = device_creator<sy6545_1_device>;
+const device_type SY6845E = device_creator<sy6845e_device>;
+const device_type HD6345 = device_creator<hd6345_device>;
+const device_type AMS40041 = device_creator<ams40041_device>;
+const device_type AMS40489 = device_creator<ams40489_device>;
+const device_type MOS8563 = device_creator<mos8563_device>;
+const device_type MOS8568 = device_creator<mos8568_device>;
/* mode macros */
diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp
index 4c07d65033f..e3781147f60 100644
--- a/src/devices/video/mc6847.cpp
+++ b/src/devices/video/mc6847.cpp
@@ -1760,14 +1760,14 @@ mc6847_base_device::pixel_t mc6847_base_device::artifacter::mix_color(double fac
// VARIATIONS
//**************************************************************************
-const device_type MC6847_NTSC = &device_creator<mc6847_ntsc_device>;
-const device_type MC6847_PAL = &device_creator<mc6847_pal_device>;
-const device_type MC6847Y_NTSC = &device_creator<mc6847y_ntsc_device>;
-const device_type MC6847Y_PAL = &device_creator<mc6847y_pal_device>;
-const device_type MC6847T1_NTSC = &device_creator<mc6847t1_ntsc_device>;
-const device_type MC6847T1_PAL = &device_creator<mc6847t1_pal_device>;
-const device_type S68047 = &device_creator<s68047_device>;
-const device_type M5C6847P1 = &device_creator<m5c6847p1_device>;
+const device_type MC6847_NTSC = device_creator<mc6847_ntsc_device>;
+const device_type MC6847_PAL = device_creator<mc6847_pal_device>;
+const device_type MC6847Y_NTSC = device_creator<mc6847y_ntsc_device>;
+const device_type MC6847Y_PAL = device_creator<mc6847y_pal_device>;
+const device_type MC6847T1_NTSC = device_creator<mc6847t1_ntsc_device>;
+const device_type MC6847T1_PAL = device_creator<mc6847t1_pal_device>;
+const device_type S68047 = device_creator<s68047_device>;
+const device_type M5C6847P1 = device_creator<m5c6847p1_device>;
diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h
index 1d408c5f560..100d3033877 100644
--- a/src/devices/video/mc6847.h
+++ b/src/devices/video/mc6847.h
@@ -7,11 +7,12 @@
Implementation of Motorola 6847 video hardware chip
***************************************************************************/
+#ifndef MAME_DEVICES_VIDEO_MC6847_H
+#define MAME_DEVICES_VIDEO_MC6847_H
#pragma once
-#ifndef __MC6847__
-#define __MC6847__
+#include "screen.h"
#define MC6847_MODE_AG 0x80
@@ -700,4 +701,4 @@ extern const device_type MC6847T1_PAL;
extern const device_type S68047;
extern const device_type M5C6847P1;
-#endif /* __MC6847__ */
+#endif // MAME_DEVICES_VIDEO_MC6847_H
diff --git a/src/devices/video/mga2064w.cpp b/src/devices/video/mga2064w.cpp
index 50e1709594e..3dfd13dcec1 100644
--- a/src/devices/video/mga2064w.cpp
+++ b/src/devices/video/mga2064w.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "mga2064w.h"
-const device_type MGA2064W = &device_creator<mga2064w_device>;
+const device_type MGA2064W = device_creator<mga2064w_device>;
mga2064w_device::mga2064w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pci_device(mconfig, MGA2064W, "Matrox Millennium", tag, owner, clock, "mga2064w", __FILE__)
diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp
index abfbaf808e3..10a8a8d87fe 100644
--- a/src/devices/video/mos6566.cpp
+++ b/src/devices/video/mos6566.cpp
@@ -21,6 +21,8 @@
#include "emu.h"
#include "mos6566.h"
+#include "screen.h"
+
//**************************************************************************
@@ -213,13 +215,13 @@ static const rgb_t PALETTE_MOS[] =
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MOS6566 = &device_creator<mos6566_device>;
-const device_type MOS6567 = &device_creator<mos6567_device>;
-const device_type MOS8562 = &device_creator<mos8562_device>;
-const device_type MOS8564 = &device_creator<mos8564_device>;
-const device_type MOS6569 = &device_creator<mos6569_device>;
-const device_type MOS8565 = &device_creator<mos8565_device>;
-const device_type MOS8566 = &device_creator<mos8566_device>;
+const device_type MOS6566 = device_creator<mos6566_device>;
+const device_type MOS6567 = device_creator<mos6567_device>;
+const device_type MOS8562 = device_creator<mos8562_device>;
+const device_type MOS8564 = device_creator<mos8564_device>;
+const device_type MOS6569 = device_creator<mos6569_device>;
+const device_type MOS8565 = device_creator<mos8565_device>;
+const device_type MOS8566 = device_creator<mos8566_device>;
// default address maps
diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp
index c8eb8f5b790..6f720fc0f0d 100644
--- a/src/devices/video/msm6222b.cpp
+++ b/src/devices/video/msm6222b.cpp
@@ -13,8 +13,8 @@
#include "emu.h"
#include "msm6222b.h"
-const device_type MSM6222B = &device_creator<msm6222b_device>;
-const device_type MSM6222B_01 = &device_creator<msm6222b_01_device>;
+const device_type MSM6222B = device_creator<msm6222b_device>;
+const device_type MSM6222B_01 = device_creator<msm6222b_01_device>;
ROM_START( msm6222b_01 )
ROM_REGION( 0x1000, "cgrom", 0 )
diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp
index 10a5eb6e368..516dd8a0f12 100644
--- a/src/devices/video/msm6255.cpp
+++ b/src/devices/video/msm6255.cpp
@@ -52,7 +52,7 @@
//**************************************************************************
// device type definition
-const device_type MSM6255 = &device_creator<msm6255_device>;
+const device_type MSM6255 = device_creator<msm6255_device>;
// I/O map
DEVICE_ADDRESS_MAP_START( map, 8, msm6255_device )
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 4e31bf99514..29d51ef495b 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -46,9 +46,13 @@
#include "emu.h"
#include "pc_vga.h"
+
#include "bus/isa/trident.h"
#include "machine/eepromser.h"
+
#include "debugger.h"
+#include "screen.h"
+
/***************************************************************************
@@ -117,25 +121,23 @@ enum
***************************************************************************/
// device type definition
-const device_type VGA = &device_creator<vga_device>;
-const device_type TSENG_VGA = &device_creator<tseng_vga_device>;
-const device_type S3_VGA = &device_creator<s3_vga_device>;
-const device_type GAMTOR_VGA = &device_creator<gamtor_vga_device>;
-const device_type ATI_VGA = &device_creator<ati_vga_device>;
-const device_type IBM8514A = &device_creator<ibm8514a_device>;
-const device_type MACH8 = &device_creator<mach8_device>;
+const device_type VGA = device_creator<vga_device>;
+const device_type TSENG_VGA = device_creator<tseng_vga_device>;
+const device_type S3_VGA = device_creator<s3_vga_device>;
+const device_type GAMTOR_VGA = device_creator<gamtor_vga_device>;
+const device_type ATI_VGA = device_creator<ati_vga_device>;
+const device_type IBM8514A = device_creator<ibm8514a_device>;
+const device_type MACH8 = device_creator<mach8_device>;
vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_palette(*this, "^palette"),
- m_screen(*this,"^screen")
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ , m_palette(*this, "^palette")
+ , m_screen(*this,"^screen")
{
}
vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__),
- m_palette(*this, "^palette"),
- m_screen(*this,"^screen")
+ : vga_device(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__)
{
}
@@ -150,7 +152,7 @@ tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *ta
}
s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ati_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__)
+ : s3_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__)
{
}
@@ -165,7 +167,7 @@ gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char *
}
ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : svga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__)
+ : ati_vga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__)
{
}
@@ -175,7 +177,7 @@ ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type,
}
ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__)
+ : ibm8514a_device(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__)
{
}
@@ -190,7 +192,7 @@ mach8_device::mach8_device(const machine_config &mconfig, device_type type, cons
}
mach8_device::mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__)
+ : mach8_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__)
{
}
diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h
index f4444774ab5..c5d4cef9156 100644
--- a/src/devices/video/pc_vga.h
+++ b/src/devices/video/pc_vga.h
@@ -8,8 +8,8 @@
***************************************************************************/
-#ifndef PC_VGA_H
-#define PC_VGA_H
+#ifndef MAME_DEVICES_VIDEO_PC_VGA_H
+#define MAME_DEVICES_VIDEO_PC_VGA_H
MACHINE_CONFIG_EXTERN( pcvideo_vga );
MACHINE_CONFIG_EXTERN( pcvideo_trident_vga );
@@ -33,14 +33,13 @@ enum
// ======================> vga_device
-class vga_device : public device_t
+class vga_device : public device_t
{
friend class ibm8514a_device;
public:
// construction/destruction
vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void zero();
virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -56,7 +55,10 @@ public:
virtual READ8_MEMBER(mem_linear_r);
virtual WRITE8_MEMBER(mem_linear_w);
virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb);
+
protected:
+ vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -242,12 +244,13 @@ extern const device_type VGA;
class svga_device : public vga_device
{
public:
- // construction/destruction
- svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
virtual void zero() override;
virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+
protected:
+ // construction/destruction
+ svga_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);
+
void svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void svga_vh_rgb15(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void svga_vh_rgb16(bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -264,15 +267,14 @@ protected:
uint8_t rgb24_en;
uint8_t rgb32_en;
uint8_t id;
- }svga;
+ } svga;
};
// ======================> ibm8514_device
-class ibm8514a_device : public device_t
+class ibm8514a_device : public device_t
{
public:
- ibm8514a_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);
ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_vga(const char* tag) { m_vga_tag.assign(tag); }
@@ -378,6 +380,8 @@ public:
} ibm8514;
protected:
+ ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+
virtual void device_start() override;
virtual void device_config_complete() override;
vga_device* m_vga; // for pass-through
@@ -411,7 +415,6 @@ extern const device_type IBM8514A;
class mach8_device : public ibm8514a_device
{
public:
- mach8_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);
mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
READ16_MEMBER(mach8_ec0_r);
@@ -441,6 +444,7 @@ public:
READ16_MEMBER(mach8_clksel_r) { return mach8.clksel; }
protected:
+ mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_start() override;
struct
{
@@ -516,7 +520,6 @@ class ati_vga_device : public svga_device
public:
// construction/destruction
ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual READ8_MEMBER(mem_r) override;
virtual WRITE8_MEMBER(mem_w) override;
@@ -531,6 +534,7 @@ public:
mach8_device* get_8514() { return m_8514; }
protected:
+ ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_start() override;
private:
void ati_define_video_mode();
@@ -549,12 +553,11 @@ extern const device_type ATI_VGA;
// ======================> s3_vga_device
-class s3_vga_device : public ati_vga_device
+class s3_vga_device : public ati_vga_device
{
public:
// construction/destruction
s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -571,7 +574,10 @@ public:
virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb) override;
ibm8514a_device* get_8514() { return m_8514; }
+
protected:
+ s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -699,4 +705,4 @@ extern const device_type GAMTOR_VGA;
*/
-#endif /* PC_VGA_H */
+#endif /* MAME_DEVICES_VIDEO_PC_VGA_H */
diff --git a/src/devices/video/pcd8544.cpp b/src/devices/video/pcd8544.cpp
index 73430cfbdd5..89ce964d6c0 100644
--- a/src/devices/video/pcd8544.cpp
+++ b/src/devices/video/pcd8544.cpp
@@ -9,13 +9,16 @@
#include "emu.h"
#include "video/pcd8544.h"
+#include "screen.h"
+
+
#define LOG 0
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PCD8544 = &device_creator<pcd8544_device>;
+const device_type PCD8544 = device_creator<pcd8544_device>;
//**************************************************************************
diff --git a/src/devices/video/poly.h b/src/devices/video/poly.h
index 72706e037e3..a8b606bc08e 100644
--- a/src/devices/video/poly.h
+++ b/src/devices/video/poly.h
@@ -32,14 +32,17 @@
***************************************************************************/
+#ifndef MAME_DEVICES_VIDEO_POLY_H
+#define MAME_DEVICES_VIDEO_POLY_H
+
#pragma once
-#ifndef __POLY_H__
-#define __POLY_H__
+#include "screen.h"
#include <limits.h>
#include <atomic>
+
//**************************************************************************
// DEBUGGING
//**************************************************************************
@@ -1318,4 +1321,4 @@ int frustum_clip_all(frustum_clip_vertex<_BaseType, _MaxParams>* clip_vert, int
}
-#endif // __POLY_H__
+#endif // MAME_DEVICES_VIDEO_POLY_H
diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp
index c86bed6c6fb..670e504b351 100644
--- a/src/devices/video/ppu2c0x.cpp
+++ b/src/devices/video/ppu2c0x.cpp
@@ -28,6 +28,8 @@
#include "emu.h"
#include "video/ppu2c0x.h"
+#include "screen.h"
+
/***************************************************************************
CONSTANTS
@@ -73,14 +75,14 @@ static const pen_t default_colortable[] =
//**************************************************************************
// devices
-const device_type PPU_2C02 = &device_creator<ppu2c02_device>;
-const device_type PPU_2C03B = &device_creator<ppu2c03b_device>;
-const device_type PPU_2C04 = &device_creator<ppu2c04_device>;
-const device_type PPU_2C07 = &device_creator<ppu2c07_device>;
-const device_type PPU_2C05_01 = &device_creator<ppu2c05_01_device>;
-const device_type PPU_2C05_02 = &device_creator<ppu2c05_02_device>;
-const device_type PPU_2C05_03 = &device_creator<ppu2c05_03_device>;
-const device_type PPU_2C05_04 = &device_creator<ppu2c05_04_device>;
+const device_type PPU_2C02 = device_creator<ppu2c02_device>;
+const device_type PPU_2C03B = device_creator<ppu2c03b_device>;
+const device_type PPU_2C04 = device_creator<ppu2c04_device>;
+const device_type PPU_2C07 = device_creator<ppu2c07_device>;
+const device_type PPU_2C05_01 = device_creator<ppu2c05_01_device>;
+const device_type PPU_2C05_02 = device_creator<ppu2c05_02_device>;
+const device_type PPU_2C05_03 = device_creator<ppu2c05_03_device>;
+const device_type PPU_2C05_04 = device_creator<ppu2c05_04_device>;
// default address map
diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp
index 27490f6738b..6b2963babdf 100644
--- a/src/devices/video/psx.cpp
+++ b/src/devices/video/psx.cpp
@@ -7,20 +7,23 @@
*
*/
-#define DEBUG_VIEWER ( 0 )
-
#include "emu.h"
+
+#define DEBUG_VIEWER ( 0 )
#include "video/psx.h"
+#include "screen.h"
+
+
#define VERBOSE_LEVEL ( 0 )
// device type definition
-const device_type CXD8514Q = &device_creator<cxd8514q_device>;
-const device_type CXD8538Q = &device_creator<cxd8538q_device>;
-const device_type CXD8561Q = &device_creator<cxd8561q_device>;
-const device_type CXD8561BQ = &device_creator<cxd8561bq_device>;
-const device_type CXD8561CQ = &device_creator<cxd8561cq_device>;
-const device_type CXD8654Q = &device_creator<cxd8654q_device>;
+const device_type CXD8514Q = device_creator<cxd8514q_device>;
+const device_type CXD8538Q = device_creator<cxd8538q_device>;
+const device_type CXD8561Q = device_creator<cxd8561q_device>;
+const device_type CXD8561BQ = device_creator<cxd8561bq_device>;
+const device_type CXD8561CQ = device_creator<cxd8561cq_device>;
+const device_type CXD8654Q = device_creator<cxd8654q_device>;
psxgpu_device::psxgpu_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/video/ramdac.cpp b/src/devices/video/ramdac.cpp
index 9b5220bd1eb..195365fff91 100644
--- a/src/devices/video/ramdac.cpp
+++ b/src/devices/video/ramdac.cpp
@@ -29,7 +29,7 @@ ADDRESS_MAP_END
//**************************************************************************
// device type definition
-const device_type RAMDAC = &device_creator<ramdac_device>;
+const device_type RAMDAC = device_creator<ramdac_device>;
//**************************************************************************
diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp
index e4eb44768a3..78486be43a6 100644
--- a/src/devices/video/saa5050.cpp
+++ b/src/devices/video/saa5050.cpp
@@ -26,14 +26,14 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SAA5050 = &device_creator<saa5050_device>;
-const device_type SAA5051 = &device_creator<saa5051_device>;
-const device_type SAA5052 = &device_creator<saa5052_device>;
-const device_type SAA5053 = &device_creator<saa5053_device>;
-const device_type SAA5054 = &device_creator<saa5054_device>;
-const device_type SAA5055 = &device_creator<saa5055_device>;
-const device_type SAA5056 = &device_creator<saa5056_device>;
-const device_type SAA5057 = &device_creator<saa5057_device>;
+const device_type SAA5050 = device_creator<saa5050_device>;
+const device_type SAA5051 = device_creator<saa5051_device>;
+const device_type SAA5052 = device_creator<saa5052_device>;
+const device_type SAA5053 = device_creator<saa5053_device>;
+const device_type SAA5054 = device_creator<saa5054_device>;
+const device_type SAA5055 = device_creator<saa5055_device>;
+const device_type SAA5056 = device_creator<saa5056_device>;
+const device_type SAA5057 = device_creator<saa5057_device>;
//-------------------------------------------------
diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp
index 970a3a4e7f4..517580c2231 100644
--- a/src/devices/video/scn2674.cpp
+++ b/src/devices/video/scn2674.cpp
@@ -7,10 +7,13 @@
#include "emu.h"
#include "scn2674.h"
+#include "screen.h"
+
+
#define S674VERBOSE 0
#define LOG2674(x) do { if (S674VERBOSE) logerror x; } while (0)
-const device_type SCN2674_VIDEO = &device_creator<scn2674_device>;
+const device_type SCN2674_VIDEO = device_creator<scn2674_device>;
// default address map
diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp
index 583b2c955c9..7e1af926245 100644
--- a/src/devices/video/sed1200.cpp
+++ b/src/devices/video/sed1200.cpp
@@ -16,10 +16,10 @@
#include "emu.h"
#include "sed1200.h"
-const device_type SED1200D0A = &device_creator<sed1200d0a_device>;
-const device_type SED1200F0A = &device_creator<sed1200f0a_device>;
-const device_type SED1200D0B = &device_creator<sed1200d0b_device>;
-const device_type SED1200F0B = &device_creator<sed1200f0b_device>;
+const device_type SED1200D0A = device_creator<sed1200d0a_device>;
+const device_type SED1200F0A = device_creator<sed1200f0a_device>;
+const device_type SED1200D0B = device_creator<sed1200d0b_device>;
+const device_type SED1200F0B = device_creator<sed1200f0b_device>;
ROM_START( sed1200x0a )
ROM_REGION( 0x800, "cgrom", 0 )
diff --git a/src/devices/video/sed1330.cpp b/src/devices/video/sed1330.cpp
index acce37b1806..d7cb154cb91 100644
--- a/src/devices/video/sed1330.cpp
+++ b/src/devices/video/sed1330.cpp
@@ -61,7 +61,7 @@
//**************************************************************************
// device type definition
-const device_type SED1330 = &device_creator<sed1330_device>;
+const device_type SED1330 = device_creator<sed1330_device>;
// default address map
diff --git a/src/devices/video/sed1520.cpp b/src/devices/video/sed1520.cpp
index 7d65e9a76af..83f884d5756 100644
--- a/src/devices/video/sed1520.cpp
+++ b/src/devices/video/sed1520.cpp
@@ -12,12 +12,14 @@
#include "emu.h"
#include "video/sed1520.h"
+#include "screen.h"
+
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SED1520 = &device_creator<sed1520_device>;
+const device_type SED1520 = device_creator<sed1520_device>;
//**************************************************************************
diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp
index 9cfe6001452..8fcfb4af3e6 100644
--- a/src/devices/video/snes_ppu.cpp
+++ b/src/devices/video/snes_ppu.cpp
@@ -189,7 +189,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type SNES_PPU = &device_creator<snes_ppu_device>;
+const device_type SNES_PPU = device_creator<snes_ppu_device>;
//**************************************************************************
diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h
index d8ca3fee814..ab1a30245df 100644
--- a/src/devices/video/snes_ppu.h
+++ b/src/devices/video/snes_ppu.h
@@ -6,10 +6,12 @@
***************************************************************************/
+#ifndef MAME_DEVICES_VIDEO_SNES_PPU_H
+#define MAME_DEVICES_VIDEO_SNES_PPU_H
+
#pragma once
-#ifndef __SNES_PPU_H__
-#define __SNES_PPU_H__
+#include "screen.h"
#define MCLK_NTSC (21477272) /* verified */
@@ -297,4 +299,4 @@ extern const device_type SNES_PPU;
#define MCFG_SNES_PPU_OPENBUS_CB(_read) \
devcb = &snes_ppu_device::static_set_open_bus_callback(*device, DEVCB_##_read);
-#endif
+#endif // MAME_DEVICES_VIDEO_SNES_PPU_H
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index bbf5d601921..6aa670dd7b7 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -16,7 +16,8 @@ Framebuffer todo:
#include "emu.h"
-#include "includes/saturn.h"
+#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME
+
#define VDP1_LOG 0
diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp
index 8622f24b3c2..0f6e36ec07c 100644
--- a/src/devices/video/stvvdp2.cpp
+++ b/src/devices/video/stvvdp2.cpp
@@ -2,10 +2,6 @@
// copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont
/* Sega Saturn VDP2 */
-#define DEBUG_MODE 0
-#define TEST_FUNCTIONS 0
-#define POPMESSAGE_DEBUG 0
-
/*
the dirty marking stuff and tile decoding will probably be removed in the end anyway as we'll need custom
@@ -105,7 +101,15 @@ In other words,the first three types uses the offset and not the color allocated
*/
#include "emu.h"
-#include "includes/saturn.h"
+#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME
+
+#include "screen.h"
+
+
+#define DEBUG_MODE 0
+#define TEST_FUNCTIONS 0
+#define POPMESSAGE_DEBUG 0
+
enum
{
diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp
index 72df41a52d9..60780b84f0b 100644
--- a/src/devices/video/t6a04.cpp
+++ b/src/devices/video/t6a04.cpp
@@ -15,7 +15,7 @@
#include "video/t6a04.h"
// devices
-const device_type T6A04 = &device_creator<t6a04_device>;
+const device_type T6A04 = device_creator<t6a04_device>;
//-------------------------------------------------
// device_validity_check - perform validity checks
diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp
index f41520ddd17..5343de12830 100644
--- a/src/devices/video/tea1002.cpp
+++ b/src/devices/video/tea1002.cpp
@@ -39,7 +39,7 @@ const int tea1002_device::m_amplitute[] =
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TEA1002 = &device_creator<tea1002_device>;
+const device_type TEA1002 = device_creator<tea1002_device>;
//**************************************************************************
diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp
index 476b2f38829..ba4283fc683 100644
--- a/src/devices/video/tlc34076.cpp
+++ b/src/devices/video/tlc34076.cpp
@@ -35,7 +35,7 @@
//**************************************************************************
// device type definition
-const device_type TLC34076 = &device_creator<tlc34076_device>;
+const device_type TLC34076 = device_creator<tlc34076_device>;
//-------------------------------------------------
diff --git a/src/devices/video/tms34061.cpp b/src/devices/video/tms34061.cpp
index 768c7a01cda..3a74d450c52 100644
--- a/src/devices/video/tms34061.cpp
+++ b/src/devices/video/tms34061.cpp
@@ -15,6 +15,8 @@
#include "emu.h"
#include "tms34061.h"
+#include "screen.h"
+
#define VERBOSE (0)
@@ -27,7 +29,7 @@
// tms34061_device - constructor
//-------------------------------------------------
-const device_type TMS34061 = &device_creator<tms34061_device>;
+const device_type TMS34061 = device_creator<tms34061_device>;
tms34061_device::tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TMS34061, "TMS34061 VSC", tag, owner, clock, "tms34061", __FILE__),
diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp
index 0543cdfb332..ff902edd80c 100644
--- a/src/devices/video/tms3556.cpp
+++ b/src/devices/video/tms3556.cpp
@@ -16,6 +16,10 @@
#include "emu.h"
#include "tms3556.h"
+#include "screen.h"
+
+
+
//**************************************************************************
// MACROS / CONSTANTS
//**************************************************************************
@@ -29,7 +33,7 @@
//**************************************************************************
// devices
-const device_type TMS3556 = &device_creator<tms3556_device>;
+const device_type TMS3556 = device_creator<tms3556_device>;
// default address map
diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp
index b095a5f8a04..c224b0965f4 100644
--- a/src/devices/video/tms9927.cpp
+++ b/src/devices/video/tms9927.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "video/tms9927.h"
+#include "screen.h"
+
static const uint8_t chars_per_row_value[8] = { 20, 32, 40, 64, 72, 80, 96, 132 };
static const uint8_t skew_bits_value[4] = { 0, 1, 2, 2 };
@@ -29,10 +31,10 @@ static const uint8_t skew_bits_value[4] = { 0, 1, 2, 2 };
#define CURSOR_ROW_ADDRESS (m_reg[8] & 0x3f)
-const device_type TMS9927 = &device_creator<tms9927_device>;
-const device_type CRT5027 = &device_creator<crt5027_device>;
-const device_type CRT5037 = &device_creator<crt5037_device>;
-const device_type CRT5057 = &device_creator<crt5057_device>;
+const device_type TMS9927 = device_creator<tms9927_device>;
+const device_type CRT5027 = device_creator<crt5027_device>;
+const device_type CRT5037 = device_creator<crt5037_device>;
+const device_type CRT5057 = device_creator<crt5057_device>;
tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: tms9927_device(mconfig, TMS9927, "TMS9927 VTC", tag, owner, clock, "tms9927", __FILE__)
diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp
index cb39a6659c5..5eacf00e2fb 100644
--- a/src/devices/video/tms9928a.cpp
+++ b/src/devices/video/tms9928a.cpp
@@ -27,14 +27,14 @@
#include "tms9928a.h"
-const device_type TMS9928A = &device_creator<tms9928a_device>;
-const device_type TMS9918 = &device_creator<tms9918_device>;
-const device_type TMS9918A = &device_creator<tms9918a_device>;
-const device_type TMS9118 = &device_creator<tms9118_device>;
-const device_type TMS9128 = &device_creator<tms9128_device>;
-const device_type TMS9929 = &device_creator<tms9929_device>;
-const device_type TMS9929A = &device_creator<tms9929a_device>;
-const device_type TMS9129 = &device_creator<tms9129_device>;
+const device_type TMS9928A = device_creator<tms9928a_device>;
+const device_type TMS9918 = device_creator<tms9918_device>;
+const device_type TMS9918A = device_creator<tms9918a_device>;
+const device_type TMS9118 = device_creator<tms9118_device>;
+const device_type TMS9128 = device_creator<tms9128_device>;
+const device_type TMS9929 = device_creator<tms9929_device>;
+const device_type TMS9929A = device_creator<tms9929a_device>;
+const device_type TMS9129 = device_creator<tms9129_device>;
// ======= Debugging =========
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index 36dc2655928..03389ac14ad 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -23,9 +23,12 @@
*/
-#ifndef __TMS9928A_H__
-#define __TMS9928A_H__
+#ifndef MAME_DEVICES_VIDEO_TMS9928A_H
+#define MAME_DEVICES_VIDEO_TMS9928A_H
+#pragma once
+
+#include "screen.h"
#define TMS9928A_PALETTE_SIZE 16
@@ -213,4 +216,4 @@ public:
};
-#endif
+#endif // MAME_DEVICES_VIDEO_TMS9928A_H
diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp
index e84ad8436e6..8b6dce81ffa 100644
--- a/src/devices/video/upd3301.cpp
+++ b/src/devices/video/upd3301.cpp
@@ -22,6 +22,8 @@
#include "emu.h"
#include "upd3301.h"
+#include "screen.h"
+
//**************************************************************************
@@ -63,7 +65,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type UPD3301 = &device_creator<upd3301_device>;
+const device_type UPD3301 = device_creator<upd3301_device>;
diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp
index 32aa6ba4b18..46e97fab0ba 100644
--- a/src/devices/video/upd7220.cpp
+++ b/src/devices/video/upd7220.cpp
@@ -37,6 +37,8 @@
#include "emu.h"
#include "upd7220.h"
+#include "screen.h"
+
//**************************************************************************
@@ -143,7 +145,7 @@ static const int y_dir[8] = { 1, 1, 0,-1,-1,-1, 0, 1};
//**************************************************************************
// devices
-const device_type UPD7220 = &device_creator<upd7220_device>;
+const device_type UPD7220 = device_creator<upd7220_device>;
// default address map
diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp
index 8cc0d97867e..61a415f608a 100644
--- a/src/devices/video/upd7227.cpp
+++ b/src/devices/video/upd7227.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type UPD7227 = &device_creator<upd7227_device>;
+const device_type UPD7227 = device_creator<upd7227_device>;
static ADDRESS_MAP_START( upd7227_map, AS_PROGRAM, 8, upd7227_device )
diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp
index 141448d463a..03476fd36af 100644
--- a/src/devices/video/v9938.cpp
+++ b/src/devices/video/v9938.cpp
@@ -84,8 +84,8 @@ ADDRESS_MAP_END
// devices
-const device_type V9938 = &device_creator<v9938_device>;
-const device_type V9958 = &device_creator<v9958_device>;
+const device_type V9938 = device_creator<v9938_device>;
+const device_type V9958 = device_creator<v9958_device>;
v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h
index 58846d58512..a927de33bd3 100644
--- a/src/devices/video/v9938.h
+++ b/src/devices/video/v9938.h
@@ -6,11 +6,12 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_DEVICES_VIDEO_V9938_H
+#define MAME_DEVICES_VIDEO_V9938_H
-#ifndef __V9938_H__
-#define __V9938_H__
+#pragma once
+#include "screen.h"
//**************************************************************************
@@ -296,4 +297,4 @@ protected:
};
-#endif
+#endif // MAME_DEVICES_VIDEO_V9938_H
diff --git a/src/devices/video/vector.cpp b/src/devices/video/vector.cpp
index feb9a7e9a5c..70fa93f44bb 100644
--- a/src/devices/video/vector.cpp
+++ b/src/devices/video/vector.cpp
@@ -65,7 +65,7 @@ void vector_options::init(emu_options& options)
}
// device type definition
-const device_type VECTOR = &device_creator<vector_device>;
+const device_type VECTOR = device_creator<vector_device>;
vector_device::vector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VECTOR, "VECTOR", tag, owner, clock, "vector_device", __FILE__),
diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp
index 9e30e8b9d30..cbf7d7ac10a 100644
--- a/src/devices/video/vic4567.cpp
+++ b/src/devices/video/vic4567.cpp
@@ -18,6 +18,9 @@
#include "emu.h"
#include "video/vic4567.h"
+#include "screen.h"
+
+
/*****************************************************************************
CONSTANTS
*****************************************************************************/
@@ -142,7 +145,7 @@
#define VIC3_BITPLANE_IADDR(x) (x & 1 ? VIC3_BITPLANE_IADDR_HELPER(x) + 0x10000 : VIC3_BITPLANE_IADDR_HELPER(x))
-const device_type VIC3 = &device_creator<vic3_device>;
+const device_type VIC3 = device_creator<vic3_device>;
vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock, "vic3", __FILE__),
diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.h
index 095f29f972c..810fdc557e1 100644
--- a/src/devices/video/vooddefs.h
+++ b/src/devices/video/vooddefs.h
@@ -8,6 +8,12 @@
***************************************************************************/
+#ifndef MAME_DEVICES_VIDEO_VOODDEFS_H
+#define MAME_DEVICES_VIDEO_VOODDEFS_H
+
+#pragma once
+
+#include "video/rgbutil.h"
@@ -3194,3 +3200,5 @@ static inline rgbaint_t ATTR_FORCE_INLINE combineTexture(tmu_state *TT, const ui
result.xor_imm_rgba(0xff, 0, 0, 0);
return result;
}
+
+#endif // MAME_DEVICES_VIDEO_VOODDEFS_H
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 2fa7c629bb5..35014038b71 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -143,11 +143,11 @@ bits(7:4) and bit(24)), X, and Y:
#include "emu.h"
-
-#include "video/rgbutil.h"
#include "voodoo.h"
#include "vooddefs.h"
+#include "screen.h"
+
/*************************************
*
@@ -5781,7 +5781,7 @@ void voodoo_device::device_stop()
}
-const device_type VOODOO_1 = &device_creator<voodoo_1_device>;
+const device_type VOODOO_1 = device_creator<voodoo_1_device>;
voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__)
@@ -5798,7 +5798,7 @@ void voodoo_1_device::device_start()
}
-const device_type VOODOO_2 = &device_creator<voodoo_2_device>;
+const device_type VOODOO_2 = device_creator<voodoo_2_device>;
voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__)
@@ -5815,7 +5815,7 @@ void voodoo_2_device::device_start()
}
-const device_type VOODOO_BANSHEE = &device_creator<voodoo_banshee_device>;
+const device_type VOODOO_BANSHEE = device_creator<voodoo_banshee_device>;
voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock, "voodoo_banshee", __FILE__)
@@ -5837,7 +5837,7 @@ void voodoo_banshee_device::device_start()
}
-const device_type VOODOO_3 = &device_creator<voodoo_3_device>;
+const device_type VOODOO_3 = device_creator<voodoo_3_device>;
voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: voodoo_banshee_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock, "voodoo_3", __FILE__)
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index 9221b051b16..4c6214ce5d0 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -3,6 +3,9 @@
#include "emu.h"
#include "voodoo_pci.h"
+#include "screen.h"
+
+
int voodoo_pci_device::m_type = 0;
static MACHINE_CONFIG_FRAGMENT( voodoo_1_pci )
@@ -50,7 +53,7 @@ machine_config_constructor voodoo_pci_device::device_mconfig_additions() const
}
}
-const device_type VOODOO_PCI = &device_creator<voodoo_pci_device>;
+const device_type VOODOO_PCI = device_creator<voodoo_pci_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, voodoo_pci_device)
AM_RANGE(0x40, 0x4f) AM_READWRITE (pcictrl_r, pcictrl_w)
diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp
index f40789b86ff..8df43743fa1 100644
--- a/src/devices/video/zeus2.cpp
+++ b/src/devices/video/zeus2.cpp
@@ -21,7 +21,7 @@ zeus2_renderer::zeus2_renderer(zeus2_device *state)
{
}
-const device_type ZEUS2 = &device_creator<zeus2_device>;
+const device_type ZEUS2 = device_creator<zeus2_device>;
zeus2_device::zeus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ZEUS2, "Midway Zeus2", tag, owner, clock, "zeus2", __FILE__),