summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-27 22:16:07 +1100
committer Vas Crabb <vas@vastheman.com>2017-02-27 22:57:14 +1100
commit6c23897483a0201dd0b65b450253fd9bf8fb8723 (patch)
tree62a083b4801f63b09bed57ae0c9e8f646aaa3200 /src/devices
parentb07c572f709e95dcd1e2e4b9d4c696e122f67655 (diff)
Self-registering devices prep:
* Make device_creator a variable template and get rid of the ampersands * Remove screen.h and speaker.h from emu.h and add where necessary * Centralise instantiations of screen and speaker finder templates * Add/standardise #include guards in many hearers * Remove many redundant #includes * Order #includesr to help catch headers that can't be #included alone (nw) This changes #include order to be prefix, unit header if applicable then other stuff roughly in order from most dependent to least dependent library. This helps catch headers that don't #include things that they use.
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
//*******************************