summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-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.cpp4
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp2
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp2
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp2
-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.cpp2
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp2
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp9
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h2
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp2
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp2
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp2
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp6
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp2
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp2
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp9
-rw-r--r--src/devices/bus/a2bus/a2scsi.h2
-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/a2themill.cpp2
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp2
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp2
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp2
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp2
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp2
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.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.cpp2
-rw-r--r--src/devices/bus/a2bus/ssbapple.cpp2
-rw-r--r--src/devices/bus/a2bus/ssprite.cpp2
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp2
-rw-r--r--src/devices/bus/a2bus/transwarp.cpp2
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp2
-rw-r--r--src/devices/bus/a7800/hiscore.cpp2
-rw-r--r--src/devices/bus/a7800/rom.cpp12
-rw-r--r--src/devices/bus/a7800/xboard.cpp4
-rw-r--r--src/devices/bus/a800/cassette.cpp2
-rw-r--r--src/devices/bus/abcbus/abc890.cpp12
-rw-r--r--src/devices/bus/abcbus/db411223.cpp2
-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/sio.cpp2
-rw-r--r--src/devices/bus/abcbus/unidisk.cpp2
-rw-r--r--src/devices/bus/abckb/abc77.cpp2
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp2
-rw-r--r--src/devices/bus/abckb/abc99.cpp2
-rw-r--r--src/devices/bus/adam/ide.cpp2
-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.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h2
-rw-r--r--src/devices/bus/apricot/expansion/expansion.h4
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebsid.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp2
-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/cv1797.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp8
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp4
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_65c102.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_80186.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_80286.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.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/c64/16kb.cpp2
-rw-r--r--src/devices/bus/c64/cpm.cpp2
-rw-r--r--src/devices/bus/c64/currah_speech.cpp2
-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/easyflash.cpp2
-rw-r--r--src/devices/bus/c64/fcc.cpp2
-rw-r--r--src/devices/bus/c64/geocable.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/magic_formel.cpp2
-rw-r--r--src/devices/bus/c64/magic_voice.cpp2
-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/multiscreen.cpp2
-rw-r--r--src/devices/bus/c64/music64.cpp2
-rw-r--r--src/devices/bus/c64/ps64.cpp2
-rw-r--r--src/devices/bus/c64/reu.cpp2
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp2
-rw-r--r--src/devices/bus/c64/speakeasy.cpp2
-rw-r--r--src/devices/bus/c64/supercpu.cpp2
-rw-r--r--src/devices/bus/c64/swiftlink.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/xl80.cpp2
-rw-r--r--src/devices/bus/cbm2/hrg.cpp4
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp4
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp10
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp8
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp2
-rw-r--r--src/devices/bus/cbmiec/cmdhd.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/cbus/mpu_pc98.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_118.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_26.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_86.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.cpp2
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp2
-rw-r--r--src/devices/bus/centronics/covox.cpp4
-rw-r--r--src/devices/bus/centronics/digiblst.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp2
-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/floppy.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp2
-rw-r--r--src/devices/bus/coco/coco_dcmodem.cpp2
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp2
-rw-r--r--src/devices/bus/coco/coco_gmc.cpp2
-rw-r--r--src/devices/bus/coco/coco_multi.cpp2
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp2
-rw-r--r--src/devices/bus/coco/coco_rs232.cpp2
-rw-r--r--src/devices/bus/coco/coco_ssc.cpp2
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp2
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp4
-rw-r--r--src/devices/bus/coco/dragon_jcbsnd.cpp2
-rw-r--r--src/devices/bus/compis/hrg.cpp4
-rw-r--r--src/devices/bus/compucolor/floppy.cpp2
-rw-r--r--src/devices/bus/comx35/clm.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/printer.cpp2
-rw-r--r--src/devices/bus/cpc/amdrum.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp4
-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.cpp2
-rw-r--r--src/devices/bus/cpc/mface2.cpp2
-rw-r--r--src/devices/bus/cpc/playcity.cpp2
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp2
-rw-r--r--src/devices/bus/cpc/symbfac2.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.cpp6
-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/ecbbus/grip.cpp2
-rw-r--r--src/devices/bus/econet/e01.cpp2
-rw-r--r--src/devices/bus/einstein/pipe/speculator.cpp2
-rw-r--r--src/devices/bus/einstein/pipe/tk02.cpp2
-rw-r--r--src/devices/bus/einstein/userport/speech.cpp2
-rw-r--r--src/devices/bus/electron/m2105.cpp2
-rw-r--r--src/devices/bus/electron/plus1.cpp2
-rw-r--r--src/devices/bus/electron/plus3.cpp2
-rw-r--r--src/devices/bus/electron/rombox.cpp2
-rw-r--r--src/devices/bus/electron/romboxp.cpp2
-rw-r--r--src/devices/bus/ep64/exdos.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/gamate/rom.cpp2
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp2
-rw-r--r--src/devices/bus/gba/rom.cpp4
-rw-r--r--src/devices/bus/generic/slot.h4
-rw-r--r--src/devices/bus/hexbus/hexbus.cpp2
-rw-r--r--src/devices/bus/hp80_io/82937.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/hp_dio/hp98544.cpp2
-rw-r--r--src/devices/bus/hp_dio/hp98603.cpp2
-rw-r--r--src/devices/bus/hp_dio/hp_dio.h4
-rw-r--r--src/devices/bus/hp_hil/hp_hil.h2
-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/c8050.cpp8
-rw-r--r--src/devices/bus/ieee488/c8280.cpp2
-rw-r--r--src/devices/bus/ieee488/d9060.cpp2
-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/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/interpro/keyboard/hle.cpp2
-rw-r--r--src/devices/bus/interpro/sr/gt.cpp4
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/intv/voice.cpp2
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp2
-rw-r--r--src/devices/bus/iq151/disc2.cpp2
-rw-r--r--src/devices/bus/iq151/grafik.cpp2
-rw-r--r--src/devices/bus/iq151/staper.cpp2
-rw-r--r--src/devices/bus/isa/3c503.cpp2
-rw-r--r--src/devices/bus/isa/adlib.cpp2
-rw-r--r--src/devices/bus/isa/aga.cpp2
-rw-r--r--src/devices/bus/isa/aha1542.cpp2
-rw-r--r--src/devices/bus/isa/cga.cpp6
-rw-r--r--src/devices/bus/isa/com.cpp4
-rw-r--r--src/devices/bus/isa/dectalk.cpp2
-rw-r--r--src/devices/bus/isa/ega.cpp2
-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.cpp2
-rw-r--r--src/devices/bus/isa/gus.cpp2
-rw-r--r--src/devices/bus/isa/hdc.cpp4
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp2
-rw-r--r--src/devices/bus/isa/ide.cpp17
-rw-r--r--src/devices/bus/isa/ide.h2
-rw-r--r--src/devices/bus/isa/isa.h4
-rw-r--r--src/devices/bus/isa/lpt.cpp2
-rw-r--r--src/devices/bus/isa/mach32.cpp4
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp2
-rw-r--r--src/devices/bus/isa/mda.cpp6
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/mufdc.cpp2
-rw-r--r--src/devices/bus/isa/myb3k_com.cpp2
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp6
-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.cpp2
-rw-r--r--src/devices/bus/isa/omti8621.cpp2
-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_sound.cpp2
-rw-r--r--src/devices/bus/isa/pds.cpp2
-rw-r--r--src/devices/bus/isa/pgc.cpp2
-rw-r--r--src/devices/bus/isa/sb16.cpp2
-rw-r--r--src/devices/bus/isa/sblaster.cpp6
-rw-r--r--src/devices/bus/isa/sc499.cpp2
-rw-r--r--src/devices/bus/isa/side116.cpp2
-rw-r--r--src/devices/bus/isa/ssi2001.cpp2
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp2
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp2
-rw-r--r--src/devices/bus/isa/vga.cpp10
-rw-r--r--src/devices/bus/isa/vga_ati.cpp6
-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/kc/d002.cpp2
-rw-r--r--src/devices/bus/kc/d004.cpp4
-rw-r--r--src/devices/bus/lpci/southbridge.cpp4
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.cpp2
-rw-r--r--src/devices/bus/megadrive/eeprom.cpp14
-rw-r--r--src/devices/bus/megadrive/ggenie.cpp2
-rw-r--r--src/devices/bus/megadrive/jcart.cpp12
-rw-r--r--src/devices/bus/megadrive/sk.cpp2
-rw-r--r--src/devices/bus/megadrive/svp.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/bm_012.cpp2
-rw-r--r--src/devices/bus/msx_cart/disk.cpp8
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp2
-rw-r--r--src/devices/bus/msx_cart/konami.cpp8
-rw-r--r--src/devices/bus/msx_cart/majutsushi.cpp2
-rw-r--r--src/devices/bus/msx_cart/moonsound.cpp2
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp6
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp2
-rw-r--r--src/devices/bus/msx_slot/fs4600.cpp2
-rw-r--r--src/devices/bus/msx_slot/panasonic08.cpp2
-rw-r--r--src/devices/bus/msx_slot/sony08.cpp2
-rw-r--r--src/devices/bus/nasbus/avc.cpp2
-rw-r--r--src/devices/bus/nasbus/floppy.cpp2
-rw-r--r--src/devices/bus/nasbus/nasbus.h2
-rw-r--r--src/devices/bus/neogeo/boot_cthd.cpp4
-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.cpp6
-rw-r--r--src/devices/bus/neogeo/boot_svc.cpp4
-rw-r--r--src/devices/bus/neogeo/cmc.cpp2
-rw-r--r--src/devices/bus/neogeo/fatfury2.cpp2
-rw-r--r--src/devices/bus/neogeo/kof2k2.cpp2
-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.cpp2
-rw-r--r--src/devices/bus/neogeo/pvc.cpp2
-rw-r--r--src/devices/bus/neogeo/sma.cpp2
-rw-r--r--src/devices/bus/nes/aladdin.cpp2
-rw-r--r--src/devices/bus/nes/bandai.cpp4
-rw-r--r--src/devices/bus/nes/datach.cpp4
-rw-r--r--src/devices/bus/nes/disksys.cpp2
-rw-r--r--src/devices/bus/nes/ggenie.cpp2
-rw-r--r--src/devices/bus/nes/jaleco.cpp14
-rw-r--r--src/devices/bus/nes/karastudio.cpp2
-rw-r--r--src/devices/bus/nes/konami.cpp4
-rw-r--r--src/devices/bus/nes/pt554.cpp2
-rw-r--r--src/devices/bus/nes/sunsoft.cpp2
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h2
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/newbrain/eim.cpp2
-rw-r--r--src/devices/bus/newbrain/fdc.cpp2
-rw-r--r--src/devices/bus/nubus/bootbug.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_cb264.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_image.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_m2video.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_spec8.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.cpp2
-rw-r--r--src/devices/bus/nubus/pds30_30hr.cpp2
-rw-r--r--src/devices/bus/nubus/pds30_cb264.cpp2
-rw-r--r--src/devices/bus/nubus/pds30_mc30.cpp2
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.cpp2
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.cpp2
-rw-r--r--src/devices/bus/nubus/quadralink.cpp2
-rw-r--r--src/devices/bus/odyssey2/chess.cpp2
-rw-r--r--src/devices/bus/odyssey2/voice.cpp2
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.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.cpp2
-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.h2
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp2
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp2
-rw-r--r--src/devices/bus/pet/2joysnd.cpp2
-rw-r--r--src/devices/bus/pet/c2n.cpp2
-rw-r--r--src/devices/bus/pet/cb2snd.cpp2
-rw-r--r--src/devices/bus/pet/hsg.cpp4
-rw-r--r--src/devices/bus/pet/superpet.cpp2
-rw-r--r--src/devices/bus/plus4/c1551.cpp2
-rw-r--r--src/devices/bus/plus4/sid.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.cpp2
-rw-r--r--src/devices/bus/psi_kbd/ergoline.cpp2
-rw-r--r--src/devices/bus/psx/ctlrport.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/qubide.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp2
-rw-r--r--src/devices/bus/ql/trumpcard.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/sun_kbd.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/nsmdsa.cpp2
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp2
-rw-r--r--src/devices/bus/s100/wunderbus.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/sat_ctrl/segatap.cpp2
-rw-r--r--src/devices/bus/scsi/omti5100.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.cpp2
-rw-r--r--src/devices/bus/scsi/scsicd.cpp2
-rw-r--r--src/devices/bus/scsi/scsihd.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.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp2
-rw-r--r--src/devices/bus/sms_exp/gender.cpp2
-rw-r--r--src/devices/bus/snes/bsx.cpp6
-rw-r--r--src/devices/bus/snes/event.cpp2
-rw-r--r--src/devices/bus/snes/sa1.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/sufami.cpp2
-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.h4
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/multitap.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/spectrum/fuller.cpp2
-rw-r--r--src/devices/bus/spectrum/intf1.cpp2
-rw-r--r--src/devices/bus/spectrum/intf2.cpp2
-rw-r--r--src/devices/bus/spectrum/melodik.cpp2
-rw-r--r--src/devices/bus/spectrum/uslot.cpp2
-rw-r--r--src/devices/bus/spectrum/uspeech.cpp2
-rw-r--r--src/devices/bus/ss50/mpc.cpp2
-rw-r--r--src/devices/bus/ss50/mps.cpp2
-rw-r--r--src/devices/bus/sunkbd/hlekbd.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.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/slot.h2
-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/sv805.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp2
-rw-r--r--src/devices/bus/ti8x/bitsocket.cpp2
-rw-r--r--src/devices/bus/ti8x/graphlinkhle.cpp2
-rw-r--r--src/devices/bus/ti8x/teeconn.cpp2
-rw-r--r--src/devices/bus/ti8x/tispeaker.cpp4
-rw-r--r--src/devices/bus/ti99/gromport/cartridges.cpp2
-rw-r--r--src/devices/bus/ti99/gromport/gkracker.cpp2
-rw-r--r--src/devices/bus/ti99/gromport/multiconn.cpp2
-rw-r--r--src/devices/bus/ti99/gromport/singleconn.cpp2
-rw-r--r--src/devices/bus/ti99/internal/998board.cpp2
-rw-r--r--src/devices/bus/ti99/peb/bwg.cpp2
-rw-r--r--src/devices/bus/ti99/peb/evpc.cpp2
-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.cpp8
-rw-r--r--src/devices/bus/ti99/peb/samsmem.cpp2
-rw-r--r--src/devices/bus/ti99/peb/spchsyn.cpp2
-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.cpp2
-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_hd.cpp2
-rw-r--r--src/devices/bus/ti99x/990_tap.cpp2
-rw-r--r--src/devices/bus/tiki100/8088.cpp2
-rw-r--r--src/devices/bus/tiki100/hdc.cpp2
-rw-r--r--src/devices/bus/tvc/hbf.cpp2
-rw-r--r--src/devices/bus/vcs/dpc.cpp2
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp2
-rw-r--r--src/devices/bus/vcs/scharger.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.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/vic1112.cpp2
-rw-r--r--src/devices/bus/vic20/videopak.cpp2
-rw-r--r--src/devices/bus/vip/vp550.cpp2
-rw-r--r--src/devices/bus/vip/vp575.cpp2
-rw-r--r--src/devices/bus/vip/vp590.cpp2
-rw-r--r--src/devices/bus/vip/vp595.cpp2
-rw-r--r--src/devices/bus/vip/vp620.cpp2
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp16
-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_hcpu30.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/printer.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp2
-rw-r--r--src/devices/bus/wangpc/lic.cpp2
-rw-r--r--src/devices/bus/wangpc/lvc.cpp2
-rw-r--r--src/devices/bus/wangpc/mcc.cpp2
-rw-r--r--src/devices/bus/wangpc/mvc.cpp2
-rw-r--r--src/devices/bus/wangpc/rtc.cpp2
-rw-r--r--src/devices/bus/wangpc/tig.cpp2
-rw-r--r--src/devices/bus/wangpc/wdc.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_midi.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/z88/flash.cpp2
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp2
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.h2
-rw-r--r--src/devices/cpu/esrip/esrip.h2
-rw-r--r--src/devices/cpu/h8/h83002.cpp2
-rw-r--r--src/devices/cpu/h8/h83006.cpp2
-rw-r--r--src/devices/cpu/h8/h83008.cpp2
-rw-r--r--src/devices/cpu/h8/h83048.cpp2
-rw-r--r--src/devices/cpu/h8/h83337.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2245.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2320.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2357.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2655.cpp2
-rw-r--r--src/devices/cpu/i8089/i8089.cpp2
-rw-r--r--src/devices/cpu/i86/i286.h2
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/nec/v53.cpp2
-rw-r--r--src/devices/cpu/psx/psx.cpp2
-rw-r--r--src/devices/cpu/psx/psx.h4
-rw-r--r--src/devices/cpu/sh/sh2.h6
-rw-r--r--src/devices/cpu/tms1000/tms0270.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms0970.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms1000.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms1000c.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms1400.cpp2
-rw-r--r--src/devices/cpu/tms1000/tp0320.cpp2
-rw-r--r--src/devices/cpu/tms34010/tms34010.h8
-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/imagedev/diablo.h4
-rw-r--r--src/devices/imagedev/floppy.cpp2
-rw-r--r--src/devices/imagedev/harddriv.h4
-rw-r--r--src/devices/machine/53c810.h6
-rw-r--r--src/devices/machine/68153bim.cpp2
-rw-r--r--src/devices/machine/68307.cpp2
-rw-r--r--src/devices/machine/68340.cpp2
-rw-r--r--src/devices/machine/74148.h2
-rw-r--r--src/devices/machine/74166.cpp2
-rw-r--r--src/devices/machine/8042kbdc.cpp2
-rw-r--r--src/devices/machine/adc0808.h20
-rw-r--r--src/devices/machine/adc083x.h2
-rw-r--r--src/devices/machine/adc1038.h2
-rw-r--r--src/devices/machine/adc1213x.h2
-rw-r--r--src/devices/machine/akiko.cpp2
-rw-r--r--src/devices/machine/at_keybc.cpp2
-rw-r--r--src/devices/machine/ataintf.cpp2
-rw-r--r--src/devices/machine/atapicdr.cpp2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cs4031.cpp2
-rw-r--r--src/devices/machine/diablo_hd.cpp2
-rw-r--r--src/devices/machine/f3853.h2
-rw-r--r--src/devices/machine/fdc37c665gt.cpp2
-rw-r--r--src/devices/machine/genpc.cpp8
-rw-r--r--src/devices/machine/gt64xxx.h2
-rw-r--r--src/devices/machine/i80130.cpp2
-rw-r--r--src/devices/machine/i82371sb.cpp9
-rw-r--r--src/devices/machine/idehd.cpp2
-rw-r--r--src/devices/machine/ie15.cpp4
-rw-r--r--src/devices/machine/ie15.h2
-rw-r--r--src/devices/machine/ie15_kbd.cpp2
-rw-r--r--src/devices/machine/ldpr8210.cpp4
-rw-r--r--src/devices/machine/ldv1000.cpp2
-rw-r--r--src/devices/machine/ldvp931.cpp2
-rw-r--r--src/devices/machine/linflash.cpp6
-rw-r--r--src/devices/machine/mb89363b.cpp2
-rw-r--r--src/devices/machine/mc6854.h2
-rw-r--r--src/devices/machine/mc68681.cpp6
-rw-r--r--src/devices/machine/microtch.h2
-rw-r--r--src/devices/machine/mos6551.cpp2
-rw-r--r--src/devices/machine/mpu401.cpp2
-rw-r--r--src/devices/machine/msm6253.h8
-rw-r--r--src/devices/machine/nscsi_cd.cpp2
-rw-r--r--src/devices/machine/nscsi_hd.cpp2
-rw-r--r--src/devices/machine/pc_fdc.cpp2
-rw-r--r--src/devices/machine/pc_lpt.cpp2
-rw-r--r--src/devices/machine/pci-ide.cpp2
-rw-r--r--src/devices/machine/pci9050.h2
-rw-r--r--src/devices/machine/pdc.cpp2
-rw-r--r--src/devices/machine/scnxx562.cpp2
-rw-r--r--src/devices/machine/sega_scu.cpp2
-rw-r--r--src/devices/machine/sis85c496.cpp2
-rw-r--r--src/devices/machine/smioc.cpp2
-rw-r--r--src/devices/machine/smpc.cpp2
-rw-r--r--src/devices/machine/terminal.cpp2
-rw-r--r--src/devices/machine/upd7002.h4
-rw-r--r--src/devices/machine/vrc5074.cpp2
-rw-r--r--src/devices/machine/vrc5074.h2
-rw-r--r--src/devices/machine/wd7600.cpp2
-rw-r--r--src/devices/machine/wozfdc.cpp2
-rw-r--r--src/devices/machine/z80dart.cpp2
-rw-r--r--src/devices/machine/z80scc.cpp2
-rw-r--r--src/devices/machine/z80sio.cpp4
-rw-r--r--src/devices/sound/ad1848.cpp2
-rw-r--r--src/devices/sound/bsmt2000.cpp2
-rw-r--r--src/devices/sound/cdp1869.cpp2
-rw-r--r--src/devices/sound/cdp1869.h6
-rw-r--r--src/devices/sound/cem3394.h2
-rw-r--r--src/devices/sound/es1373.cpp2
-rw-r--r--src/devices/sound/k054539.h2
-rw-r--r--src/devices/sound/lc7535.h2
-rw-r--r--src/devices/sound/pokey.h4
-rw-r--r--src/devices/sound/qs1000.cpp2
-rw-r--r--src/devices/sound/qsound.cpp2
-rw-r--r--src/devices/sound/rf5c68.h2
-rw-r--r--src/devices/sound/samples.h2
-rw-r--r--src/devices/video/315_5124.cpp4
-rw-r--r--src/devices/video/315_5313.cpp2
-rw-r--r--src/devices/video/315_5313.h6
-rw-r--r--src/devices/video/clgd542x.cpp18
-rw-r--r--src/devices/video/clgd542x.h6
-rw-r--r--src/devices/video/crt9021.h2
-rw-r--r--src/devices/video/crtc_ega.h6
-rw-r--r--src/devices/video/ef9369.h2
-rw-r--r--src/devices/video/gba_lcd.cpp2
-rw-r--r--src/devices/video/hd44780.h2
-rw-r--r--src/devices/video/hd63484.h2
-rw-r--r--src/devices/video/hd66421.cpp2
-rw-r--r--src/devices/video/huc6260.cpp2
-rw-r--r--src/devices/video/huc6272.cpp2
-rw-r--r--src/devices/video/i82730.h4
-rw-r--r--src/devices/video/i8275.h2
-rw-r--r--src/devices/video/imagetek_i4100.cpp2
-rw-r--r--src/devices/video/mc6845.cpp2
-rw-r--r--src/devices/video/mc6845.h10
-rw-r--r--src/devices/video/mc6847.h2
-rw-r--r--src/devices/video/nt7534.h2
-rw-r--r--src/devices/video/pc_vga.cpp40
-rw-r--r--src/devices/video/pc_vga.h5
-rw-r--r--src/devices/video/pcd8544.h2
-rw-r--r--src/devices/video/psx.cpp4
-rw-r--r--src/devices/video/scn2674.h2
-rw-r--r--src/devices/video/upd3301.h2
-rw-r--r--src/devices/video/upd7220.h4
-rw-r--r--src/devices/video/vic4567.cpp2
-rw-r--r--src/devices/video/voodoo_pci.cpp2
636 files changed, 863 insertions, 904 deletions
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index 3ed9e0e769e..cd2b26b769d 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -36,7 +36,7 @@ ROM_END
/* sound output */
-MACHINE_CONFIG_MEMBER( a1bus_cassette_device::device_add_mconfig )
+MACHINE_CONFIG_START(a1bus_cassette_device::device_add_mconfig)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
MCFG_CASSETTE_INTERFACE("apple1_cass")
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index b8cfb19d6d0..3839193ab3c 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -33,7 +33,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a1bus_cffa_device::device_add_mconfig )
+MACHINE_CONFIG_START(a1bus_cffa_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index e4636598f1f..b41166a07e5 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device, "a2aesms", "Applied Engin
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_sn76489_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_sn76489_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r")
MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484)
@@ -51,7 +51,7 @@ MACHINE_CONFIG_MEMBER( a2bus_sn76489_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_aesms_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_aesms_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r")
MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484)
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 266902277dd..3d11a6544ae 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -50,7 +50,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_applicard_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_applicard_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 7da3f6cfee7..30ddb40f5ac 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third M
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_arcboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_arcboard_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_arcboard_device, tms_irq_w))
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index cc5cbab5176..e8df74074cf 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_cffa2000_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_cffa2000_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD(CFFA2_ATA_TAG, ata_devices, "hdd", nullptr, false)
// not yet, the core explodes
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index a0e9916c8c2..68216a580cb 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -71,7 +71,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(a2bus_corvus_device::device_add_mconfig)
+MACHINE_CONFIG_START(a2bus_corvus_device::device_add_mconfig)
MCFG_DEVICE_ADD(CORVUS_HD_TAG, CORVUS_HDC, 0)
MCFG_HARDDISK_ADD("harddisk1")
MCFG_HARDDISK_INTERFACE("corvus_hdd")
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index 096b89a482c..1f2f4eed5b7 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -61,12 +61,12 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_floppy_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_floppy_device::device_add_mconfig)
MCFG_APPLEFDC_ADD(FDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_iwmflop_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_iwmflop_device::device_add_mconfig)
MCFG_IWM_ADD(FDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index c9102b4afa1..8b70e6c799f 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -43,7 +43,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_diskiing_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_diskiing_device::device_add_mconfig)
MCFG_DEVICE_ADD(WOZFDC_TAG, DISKII_FDC, 1021800*2)
MCFG_FLOPPY_DRIVE_ADD("0", a2_floppies, "525", a2bus_diskiing_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("1", a2_floppies, "525", a2bus_diskiing_device::floppy_formats)
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index afe84fc260e..7a098b8ff01 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device, "a2dx1", "Decillonix DX-1")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_dx1_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_dx1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_SOUND_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index 3382a8ed6a2..60916cc15fd 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device, "a2echoii", "Street Electr
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_echoii_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_echoii_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("echoii")
MCFG_SOUND_ADD(TMS_TAG, TMS5220, 640000) // Note the Echo II card has a "FREQ" potentiometer which can be used to adjust the tms5220's clock frequency; 640khz is the '8khz' value according to the tms5220 datasheet
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "echoii", 1.0)
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index c1cbfc205ec..0916471f358 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -57,10 +57,13 @@ DEFINE_DEVICE_TYPE(A2BUS_HSSCSI, a2bus_hsscsi_device, "a2hsscsi", "Apple II High
#define SCSI_BUS_TAG "scsibus"
#define SCSI_5380_TAG "scsibus:7:ncr5380"
-static MACHINE_CONFIG_START( ncr5380 )
+void a2bus_hsscsi_device::ncr5380(device_t *device)
+{
+ devcb_base *devcb;
+ (void)devcb;
MCFG_DEVICE_CLOCK(10000000)
MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_hsscsi_device, drq_w))
-MACHINE_CONFIG_END
+}
static SLOT_INTERFACE_START( hsscsi_devices )
SLOT_INTERFACE("cdrom", NSCSI_CDROM)
@@ -81,7 +84,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_hsscsi_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_hsscsi_device::device_add_mconfig)
MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG)
MCFG_NSCSI_ADD("scsibus:0", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:1", hsscsi_devices, nullptr, false)
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index da96b3e8776..c3534ede770 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -30,6 +30,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( drq_w );
+ static void ncr5380(device_t *device);
+
protected:
a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index b45220313d0..66008ea4b06 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -49,7 +49,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device, "a2mcms2", "Mountain Compute
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_mcms1_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_mcms1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("mcms_l", "mcms_r")
MCFG_DEVICE_ADD(ENGINE_TAG, MCMS, 1000000)
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index 8d923be6345..13283feaf85 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -46,7 +46,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_memexp_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_memexp_device::device_add_mconfig)
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index e68f135469b..ee9355f3c02 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MIDI, a2bus_midi_device, "a2midi", "6850 MIDI card")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_midi_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_midi_device::device_add_mconfig)
MCFG_DEVICE_ADD(MIDI_PTM_TAG, PTM6840, 1021800)
MCFG_PTM6840_EXTERNAL_CLOCKS(1021800.0f, 1021800.0f, 1021800.0f)
MCFG_PTM6840_IRQ_CB(WRITELINE(a2bus_midi_device, ptm_irq_w))
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 4711c1b5597..5a2ae1b8658 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOPLUS, a2bus_echoplus_device, "a2echop", "S
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_ayboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ayboard_device::device_add_mconfig)
MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b))
@@ -56,7 +56,7 @@ MACHINE_CONFIG_MEMBER( a2bus_ayboard_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_phasor_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_phasor_device::device_add_mconfig)
MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b))
@@ -79,7 +79,7 @@ MACHINE_CONFIG_MEMBER( a2bus_phasor_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker2", 1.0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_echoplus_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_echoplus_device::device_add_mconfig)
MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b))
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index c00a82fd5a3..b92303cee51 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -71,7 +71,7 @@ ioport_constructor a2bus_pic_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_pic_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_pic_device::device_add_mconfig)
MCFG_CENTRONICS_ADD(PIC_CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("ctx_data_in")
MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(a2bus_pic_device, ack_w))
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index c26a61ef4b3..41966f63c34 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SAM, a2bus_sam_device, "a2sam", "Don't Ask Software S.A
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_sam_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_sam_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index ad1c7a1730b..ad96378021d 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -50,10 +50,13 @@ DEFINE_DEVICE_TYPE(A2BUS_SCSI, a2bus_scsi_device, "a2scsi", "Apple II SCSI Card"
#define SCSI_BUS_TAG "scsibus"
#define SCSI_5380_TAG "scsibus:7:ncr5380"
-static MACHINE_CONFIG_START( ncr5380 )
+void a2bus_scsi_device::ncr5380(device_t *device)
+{
+ devcb_base *devcb;
+ (void)devcb;
MCFG_DEVICE_CLOCK(10000000)
MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_scsi_device, drq_w))
-MACHINE_CONFIG_END
+}
static SLOT_INTERFACE_START( scsi_devices )
SLOT_INTERFACE("cdrom", NSCSI_CDROM)
@@ -74,7 +77,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_scsi_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_scsi_device::device_add_mconfig)
MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG)
MCFG_NSCSI_ADD("scsibus:0", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:1", scsi_devices, nullptr, false)
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index f1a556eeab7..d9d143da6e9 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -30,6 +30,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( drq_w );
+ static void ncr5380(device_t *device);
+
protected:
a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index dee94497ae2..1e559e59b3d 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -36,7 +36,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_softcard_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_softcard_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 1021800*2) // Z80 runs on double the Apple II's clock
MCFG_CPU_PROGRAM_MAP(z80_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index 0ff201c038c..a6454d41500 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -96,7 +96,7 @@ ioport_constructor a2bus_ssc_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_ssc_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ssc_device::device_add_mconfig)
MCFG_DEVICE_ADD(SSC_ACIA_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w))
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index da06419d3c1..e77394ed832 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -52,7 +52,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_themill_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_themill_device::device_add_mconfig)
MCFG_CPU_ADD(M6809_TAG, M6809, 1021800) // M6809 runs at ~1 MHz as per Stellation Two's print ads
MCFG_CPU_PROGRAM_MAP(m6809_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index ce51acf1afc..d9541661c48 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -54,7 +54,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_thunderclock_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_thunderclock_device::device_add_mconfig)
MCFG_UPD1990A_ADD(THUNDERCLOCK_UPD1990_TAG, 1021800, DEVWRITELINE(DEVICE_SELF, a2bus_thunderclock_device, upd_dataout_w), NOOP)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index c4c6763405a..ef3e3341410 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -104,7 +104,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_videx160_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_videx160_device::device_add_mconfig)
MCFG_SCREEN_ADD( ULTRATERM_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(CLOCK_LOW, 882, 0, 720, 370, 0, 350 )
MCFG_SCREEN_UPDATE_DEVICE( ULTRATERM_MC6845_NAME, mc6845_device, screen_update )
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 83a707aa4e9..a1f6fdf718b 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -117,7 +117,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_videx80_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_videx80_device::device_add_mconfig)
MCFG_SCREEN_ADD( VIDEOTERM_SCREEN_NAME, RASTER) // 560x216? (80x24 7x9 characters)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 )
MCFG_SCREEN_UPDATE_DEVICE( VIDEOTERM_MC6845_NAME, mc6845_device, screen_update )
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 274fa786a1d..da7cb34972a 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -86,7 +86,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_vulcanbase_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_vulcanbase_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD(VULCAN_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 756715759b6..38861a06ac4 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -46,7 +46,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_zipdrivebase_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_zipdrivebase_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD(ZIPDRIVE_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp
index 94088a998a9..391892fccd2 100644
--- a/src/devices/bus/a2bus/agat840k_hle.cpp
+++ b/src/devices/bus/a2bus/agat840k_hle.cpp
@@ -51,7 +51,7 @@ static const floppy_interface agat840k_hle_floppy_interface =
"floppy_5_25"
};
-MACHINE_CONFIG_MEMBER( a2bus_agat840k_hle_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_agat840k_hle_device::device_add_mconfig)
MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(agat840k_hle_floppy_interface)
MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(a2bus_agat840k_hle_device, index_0_w))
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 2bc49498de2..6776260e208 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -82,7 +82,7 @@ enum
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_corvfdc01_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_corvfdc01_device::device_add_mconfig)
MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w))
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index e673fa4b634..955868dfeef 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_corvfdc02_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_corvfdc02_device::device_add_mconfig)
MCFG_UPD765A_ADD(FDC02_FDC_TAG, true, false)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc02_device, intrq_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc02_device, drq_w))
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index 325988a3a71..812494bafc6 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z C
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_ezcgi_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ezcgi_device, tms_irq_w))
@@ -48,7 +48,7 @@ MACHINE_CONFIG_MEMBER( a2bus_ezcgi_device::device_add_mconfig )
MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_ezcgi_9938_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig)
MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typical 9938 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w))
@@ -61,7 +61,7 @@ MACHINE_CONFIG_MEMBER( a2bus_ezcgi_9938_device::device_add_mconfig )
MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a2bus_ezcgi_9958_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ezcgi_9958_device::device_add_mconfig)
MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typcial 9938/9958 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w))
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 3b68c4e7852..2f583be07f6 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(A2BUS_LASER128, a2bus_laser128_device, "a2laser128", "VTech L
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_laser128_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_laser128_device::device_add_mconfig)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index ba005f57a82..829b7585d7e 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -127,7 +127,7 @@ ioport_constructor a2bus_mouse_device::device_input_ports() const
machine configurations
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER(a2bus_mouse_device::device_add_mconfig)
+MACHINE_CONFIG_START(a2bus_mouse_device::device_add_mconfig)
MCFG_CPU_ADD(MOUSE_MCU_TAG, M68705P3, 2043600)
MCFG_M68705_PORTA_R_CB(READ8(a2bus_mouse_device, mcu_port_a_r))
MCFG_M68705_PORTB_R_CB(READ8(a2bus_mouse_device, mcu_port_b_r))
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 3567e8b7595..08a3a7f615f 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_pcxporter_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_pcxporter_device::device_add_mconfig)
MCFG_CPU_ADD("v30", V30, A2BUS_7M_CLOCK) // 7.16 MHz as per manual
MCFG_CPU_PROGRAM_MAP(pc_map)
MCFG_CPU_IO_MAP(pc_io)
diff --git a/src/devices/bus/a2bus/ssbapple.cpp b/src/devices/bus/a2bus/ssbapple.cpp
index 0eabefedd49..45020e5e4dc 100644
--- a/src/devices/bus/a2bus/ssbapple.cpp
+++ b/src/devices/bus/a2bus/ssbapple.cpp
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSBAPPLE, a2bus_ssb_device, "a2ssbapl", "Multitech Indu
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_ssb_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ssb_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("ssbapple")
MCFG_SOUND_ADD(TMS_TAG, TMS5220, 640000) // guess - this gives 8 kHz output according to the datasheet
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssbapple", 1.0)
diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp
index 0371de93dcf..d3540134ad0 100644
--- a/src/devices/bus/a2bus/ssprite.cpp
+++ b/src/devices/bus/a2bus/ssprite.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSPRITE, a2bus_ssprite_device, "a2ssprite", "Synetix Su
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_ssprite_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_ssprite_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ssprite_device, tms_irq_w))
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index b2e532a7858..a75ce5cbbce 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -93,7 +93,7 @@ ioport_constructor a2bus_timemasterho_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_timemasterho_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_timemasterho_device::device_add_mconfig)
MCFG_DEVICE_ADD(TIMEMASTER_PIA_TAG, PIA6821, 1021800)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(a2bus_timemasterho_device, pia_out_a))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(a2bus_timemasterho_device, pia_out_b))
diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp
index 9288ecc0b17..d65c77a8c1d 100644
--- a/src/devices/bus/a2bus/transwarp.cpp
+++ b/src/devices/bus/a2bus/transwarp.cpp
@@ -120,7 +120,7 @@ ioport_constructor a2bus_transwarp_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( a2bus_transwarp_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2bus_transwarp_device::device_add_mconfig)
MCFG_CPU_ADD(CPU_TAG, M65C02, A2BUS_7M_CLOCK / 2)
MCFG_CPU_PROGRAM_MAP(m65c02_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 6d23eccedbe..5b53463e211 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -120,7 +120,7 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx)
// VersaBoard + POKEY @ 0x0450
-MACHINE_CONFIG_MEMBER( a78_rom_p450_vb_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_p450_vb_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp
index 2d9ca604191..5f27c9cfe7a 100644
--- a/src/devices/bus/a7800/hiscore.cpp
+++ b/src/devices/bus/a7800/hiscore.cpp
@@ -27,7 +27,7 @@ a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char
}
-MACHINE_CONFIG_MEMBER( a78_hiscore_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_hiscore_device::device_add_mconfig)
MCFG_A78_CARTRIDGE_ADD("hsc_slot", a7800_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index c9a48db2b5b..a87ce5993ee 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -244,7 +244,7 @@ WRITE8_MEMBER(a78_rom_pokey_device::write_40xx)
}
// TO DO: do we need a PAL variant?!?
-MACHINE_CONFIG_MEMBER( a78_rom_pokey_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
@@ -342,7 +342,7 @@ WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx)
m_bank = data & m_bank_mask;
}
-MACHINE_CONFIG_MEMBER( a78_rom_sg_pokey_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_sg_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
@@ -497,14 +497,14 @@ WRITE8_MEMBER(a78_rom_act_device::write_40xx)
// Machine configs for PCB variants with a POKEY at $0450
-MACHINE_CONFIG_MEMBER( a78_rom_p450_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_p450_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a78_rom_p450_pokey_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_p450_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
@@ -515,14 +515,14 @@ MACHINE_CONFIG_MEMBER( a78_rom_p450_pokey_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a78_rom_p450_sg_ram_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_p450_sg_ram_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a78_rom_p450_sg9_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_rom_p450_sg9_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index ea73d9b987f..c849d45085f 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -106,7 +106,7 @@ void a78_xm_device::device_reset()
}
-MACHINE_CONFIG_MEMBER( a78_xboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_xboard_device::device_add_mconfig)
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
@@ -115,7 +115,7 @@ MACHINE_CONFIG_MEMBER( a78_xboard_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( a78_xm_device::device_add_mconfig )
+MACHINE_CONFIG_START(a78_xm_device::device_add_mconfig)
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp
index f2f8adc8d6f..1545cf434c7 100644
--- a/src/devices/bus/a800/cassette.cpp
+++ b/src/devices/bus/a800/cassette.cpp
@@ -28,7 +28,7 @@ TODO:
DEFINE_DEVICE_TYPE(A8SIO_CASSETTE, a8sio_cassette_device, "a8sio_cass", "Atari 8 bit cassette")
const device_timer_id TIMER_CASSETTE_READ = 1;
-MACHINE_CONFIG_MEMBER( a8sio_cassette_device::device_add_mconfig )
+MACHINE_CONFIG_START(a8sio_cassette_device::device_add_mconfig)
MCFG_CASSETTE_ADD("cassette")
//MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index 17f9ed9cc57..d318bc4b19a 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(ABC856, abc856_device, "abc856", "ABC
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc890_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc890_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
@@ -42,7 +42,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc_expansion_unit_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc_expansion_unit_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abc80_cards, "abc830")
MCFG_ABCBUS_SLOT_ADD("io2", abc80_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abc80_cards, nullptr)
@@ -57,7 +57,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc894_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc894_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
@@ -68,7 +68,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc850_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc850_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "ro202")
@@ -84,7 +84,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc852_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc852_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "basf6185")
@@ -100,7 +100,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc856_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc856_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "micr1325")
diff --git a/src/devices/bus/abcbus/db411223.cpp b/src/devices/bus/abcbus/db411223.cpp
index 3061627e1ad..69dec23392d 100644
--- a/src/devices/bus/abcbus/db411223.cpp
+++ b/src/devices/bus/abcbus/db411223.cpp
@@ -66,7 +66,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( databoard_4112_23_t::device_add_mconfig )
+MACHINE_CONFIG_START(databoard_4112_23_t::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(databoard_4112_23_mem)
MCFG_CPU_IO_MAP(databoard_4112_23_io)
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index d3981c5f776..3f1a16b0be5 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -234,7 +234,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc_fd2_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2)
MCFG_CPU_PROGRAM_MAP(abc_fd2_mem)
MCFG_CPU_IO_MAP(abc_fd2_io)
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 5c06a863d83..9c05fdd44ec 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -81,7 +81,7 @@ static const z80_daisy_config daisy_chain[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc_hdc_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(abc_hdc_mem)
MCFG_CPU_IO_MAP(abc_hdc_io)
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 0c4018925d5..3a57ab09179 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -317,7 +317,7 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( luxor_55_10828_device::device_add_mconfig )
+MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2)
MCFG_CPU_PROGRAM_MAP(luxor_55_10828_mem)
MCFG_CPU_IO_MAP(luxor_55_10828_io)
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 5e01254d97c..50e33b7b884 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -287,7 +287,7 @@ static const z80_daisy_config z80_daisy_chain[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( luxor_55_21046_device::device_add_mconfig )
+MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
MCFG_CPU_PROGRAM_MAP(luxor_55_21046_mem)
@@ -306,31 +306,31 @@ MACHINE_CONFIG_MEMBER( luxor_55_21046_device::device_add_mconfig )
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( abc830_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc830_device::device_add_mconfig)
luxor_55_21046_device::device_add_mconfig(config);
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( abc832_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc832_device::device_add_mconfig)
luxor_55_21046_device::device_add_mconfig(config);
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( abc834_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc834_device::device_add_mconfig)
luxor_55_21046_device::device_add_mconfig(config);
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( abc838_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc838_device::device_add_mconfig)
luxor_55_21046_device::device_add_mconfig(config);
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( abc850_floppy_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc850_floppy_device::device_add_mconfig)
luxor_55_21046_device::device_add_mconfig(config);
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, nullptr, luxor_55_21046_device::floppy_formats)
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index 0ad61bc4f8f..02b5b6ec38f 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -245,7 +245,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( luxor_55_21056_device::device_add_mconfig )
+MACHINE_CONFIG_START(luxor_55_21056_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(luxor_55_21056_mem)
MCFG_CPU_IO_MAP(luxor_55_21056_io)
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 05181176fc1..e644ea3bb9d 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -72,7 +72,7 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( luxor_4105_device::device_add_mconfig )
+MACHINE_CONFIG_START(luxor_4105_device::device_add_mconfig)
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in")
MCFG_SCSI_BSY_HANDLER(WRITELINE(luxor_4105_device, write_sasi_bsy))
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index caf81a2284b..9cfb67300ac 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -76,7 +76,7 @@ const tiny_rom_entry *abc_sio_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc_sio_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc_sio_device::device_add_mconfig)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_4_9152MHz)
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80DART, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abcbus/unidisk.cpp b/src/devices/bus/abcbus/unidisk.cpp
index 17e8e82f01a..3ab2eb3ab76 100644
--- a/src/devices/bus/abcbus/unidisk.cpp
+++ b/src/devices/bus/abcbus/unidisk.cpp
@@ -71,7 +71,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( unidisk_t::device_add_mconfig )
+MACHINE_CONFIG_START(unidisk_t::device_add_mconfig)
MCFG_TMS99xx_ADD(TMS9995_TAG, TMS9995, 12000000, unidisk_mem, unidisk_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index 8c70cf79e6e..02f4b9f6e16 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -127,7 +127,7 @@ DISCRETE_SOUND_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc77_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// keyboard cpu
MCFG_CPU_ADD(I8035_TAG, I8035, XTAL_4_608MHz)
MCFG_CPU_PROGRAM_MAP(abc77_map)
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index 4676c0089fd..f5597eb625f 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -112,7 +112,7 @@ const tiny_rom_entry *abc800_keyboard_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc800_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc800_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_9904MHz)
MCFG_MCS48_PORT_P1_IN_CB(READ8(abc800_keyboard_device, kb_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc800_keyboard_device, kb_p1_w))
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index 54ccca87827..6e918ab3909 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -149,7 +149,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abc99_device::device_add_mconfig )
+MACHINE_CONFIG_START(abc99_device::device_add_mconfig)
// keyboard CPU
MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL_6MHz/3) // from Z5 T0 output
MCFG_CPU_PROGRAM_MAP(abc99_z2_mem)
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index 5a8ceacdf22..0bef01f45d1 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -62,7 +62,7 @@ const tiny_rom_entry *powermate_ide_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( powermate_ide_device::device_add_mconfig )
+MACHINE_CONFIG_START(powermate_ide_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index a79721c7c17..10235caa0df 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -81,7 +81,7 @@ static const struct CassetteOptions adam_cassette_options =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( adam_digital_data_pack_device::device_add_mconfig )
+MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(adam_ddp_mem)
MCFG_CPU_IO_MAP(adam_ddp_io)
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index 3b69b973121..7e04986df16 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -124,7 +124,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( adam_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(adam_fdc_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(adam_fdc_mem)
MCFG_CPU_IO_MAP(adam_fdc_io)
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index ddf397f5607..731f75fe571 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -73,7 +73,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( adam_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(adam_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(adam_kb_mem)
MCFG_CPU_IO_MAP(adam_kb_io)
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index e8c75379e92..6edd3e6da82 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -73,7 +73,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( adam_printer_device::device_add_mconfig )
+MACHINE_CONFIG_START(adam_printer_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(adam_prn_mem)
MCFG_CPU_IO_MAP(adam_prn_io)
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index efa03aba603..99889b79a99 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -73,7 +73,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( adam_spi_device::device_add_mconfig )
+MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(adam_spi_mem)
MCFG_CPU_IO_MAP(adam_spi_io)
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index 08452206082..a0ba5339de8 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -126,7 +126,7 @@ WRITE_LINE_MEMBER(a1200_kbd_device::mpu_tcmp)
m_host->krst_w(state);
}
-MACHINE_CONFIG_MEMBER(a1200_kbd_device::device_add_mconfig)
+MACHINE_CONFIG_START(a1200_kbd_device::device_add_mconfig)
MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz)
MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r));
MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD"));
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index 08daa8ca538..b8817124343 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -136,7 +136,7 @@ INPUT_PORTS_END
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(a500_kbd_device::device_add_mconfig)
+MACHINE_CONFIG_START(a500_kbd_device::device_add_mconfig)
MCFG_CPU_ADD("ic1", M6502, XTAL_3MHz / 2)
MCFG_CPU_PROGRAM_MAP(mpu6500_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 306c493fa14..8e5e260b3ad 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -45,7 +45,7 @@ static ADDRESS_MAP_START( iocpu_map, AS_PROGRAM, 8, a2232_device)
AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("shared")
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( a2232_device::device_add_mconfig )
+MACHINE_CONFIG_START(a2232_device::device_add_mconfig)
// main cpu
MCFG_CPU_ADD("iocpu", M65CE02, XTAL_28_37516MHz / 8) // should run at Amiga clock 7M / 2
MCFG_CPU_PROGRAM_MAP(iocpu_map)
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 34279eda45e..129449d267a 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -114,7 +114,7 @@ ioport_constructor a2091_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmac_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmac_hdc_device::device_add_mconfig)
MCFG_DMAC_ADD("dmac", 0)
MCFG_DMAC_SCSI_READ_HANDLER(READ8(dmac_hdc_device, dmac_scsi_r))
MCFG_DMAC_SCSI_WRITE_HANDLER(WRITE8(dmac_hdc_device, dmac_scsi_w))
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 23abe382a1f..175e4d13c22 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -57,7 +57,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( buddha_device::device_add_mconfig )
+MACHINE_CONFIG_START(buddha_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD("ata_0", ata_devices, nullptr, nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(buddha_device, ide_0_interrupt_w))
MCFG_ATA_INTERFACE_ADD("ata_1", ata_devices, nullptr, nullptr, false)
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index 3429f668ff9..38c172ead49 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -159,7 +159,7 @@
#define MCFG_ZORRO_SLOT_ADD(_zorrotag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, ZORRO_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- zorro_slot_device::set_zorro_slot(*device, owner, _zorrotag);
+ zorro_slot_device::set_zorro_slot(*device, this, _zorrotag);
// ======================> expansion slot
diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h
index 8ea2a850bc3..72746b7160e 100644
--- a/src/devices/bus/apricot/expansion/expansion.h
+++ b/src/devices/bus/apricot/expansion/expansion.h
@@ -54,10 +54,10 @@
#define MCFG_EXPANSION_ADD(_tag, _cpu_tag) \
MCFG_DEVICE_ADD(_tag, APRICOT_EXPANSION_BUS, 0) \
- apricot_expansion_bus_device::set_cpu_tag(*device, owner, _cpu_tag);
+ apricot_expansion_bus_device::set_cpu_tag(*device, this, _cpu_tag);
#define MCFG_EXPANSION_IOP_ADD(_tag) \
- apricot_expansion_bus_device::set_iop_tag(*device, owner, _tag);
+ apricot_expansion_bus_device::set_iop_tag(*device, this, _tag);
#define MCFG_EXPANSION_SLOT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, APRICOT_EXPANSION_SLOT, 0) \
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index 742917b5c9d..9663e2505e3 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -195,7 +195,7 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
return INPUT_PORTS_NAME( keyboard );
}
-MACHINE_CONFIG_MEMBER( apricot_keyboard_hle_device::device_add_mconfig )
+MACHINE_CONFIG_START(apricot_keyboard_hle_device::device_add_mconfig)
MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
index a86c31f67f3..d10db3133a6 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(BBC_BEEBSID, bbc_beebsid_device, "beebsid", "BeebSID")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_beebsid_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_beebsid_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_16MHz / 16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index 6d4e77be59c..d505b59db49 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -80,7 +80,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_opus3_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_opus3_device::device_add_mconfig)
/* fdc */
MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opus3_device, fdc_drq_w))
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 20fcd44257b..4398d8db7dc 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -120,7 +120,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_acorn8271_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_acorn8271_device::device_add_mconfig)
MCFG_DEVICE_ADD("i8271", I8271, 0)
MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_acorn8271_device, fdc_intrq_w))
MCFG_I8271_HDL_CALLBACK(WRITELINE(bbc_acorn8271_device, motor_w))
@@ -131,7 +131,7 @@ MACHINE_CONFIG_MEMBER( bbc_acorn8271_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_acorn1770_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_acorn1770_device::device_add_mconfig)
MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_drq_w))
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index ce73e576e8c..c15d196d7be 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -58,7 +58,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_cumana1_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig)
MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w))
@@ -69,7 +69,7 @@ MACHINE_CONFIG_MEMBER( bbc_cumana1_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_cumana2_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_cumana2_device::device_add_mconfig)
MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w))
diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp
index 17f0d9130c8..a623cff1cef 100644
--- a/src/devices/bus/bbc/fdc/cv1797.cpp
+++ b/src/devices/bus/bbc/fdc/cv1797.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_cv1797_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_cv1797_device::device_add_mconfig)
MCFG_FD1797_ADD("fd1797", XTAL_8MHz / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_drq_w))
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index fc05f8c3dcb..b8288fe87c4 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -88,7 +88,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_opus8272_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_opus8272_device::device_add_mconfig)
MCFG_I8272A_ADD("i8272", true)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(bbc_opus8272_device, fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("i8272:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -97,7 +97,7 @@ MACHINE_CONFIG_MEMBER( bbc_opus8272_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_opus2791_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig)
MCFG_WD2791_ADD("fdc", XTAL_16MHz / 16)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
@@ -107,7 +107,7 @@ MACHINE_CONFIG_MEMBER( bbc_opus2791_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_opus2793_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig)
MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
@@ -117,7 +117,7 @@ MACHINE_CONFIG_MEMBER( bbc_opus2793_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_opus1770_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_opus1770_device::device_add_mconfig)
MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 5280761bd18..031a9a03255 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -64,7 +64,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_weddb2_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig)
MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_drq_w))
@@ -74,7 +74,7 @@ MACHINE_CONFIG_MEMBER( bbc_weddb2_device::device_add_mconfig )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( bbc_weddb3_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_weddb3_device::device_add_mconfig)
MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_drq_w))
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index be4e0add5ed..f70a5093200 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -42,7 +42,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_tube_6502_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_6502_device::device_add_mconfig)
MCFG_CPU_ADD("m6502", M65C02, XTAL_12MHz / 4)
MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
diff --git a/src/devices/bus/bbc/tube/tube_65c102.cpp b/src/devices/bus/bbc/tube/tube_65c102.cpp
index ef54be2c0ae..35f979cf361 100644
--- a/src/devices/bus/bbc/tube/tube_65c102.cpp
+++ b/src/devices/bus/bbc/tube/tube_65c102.cpp
@@ -42,7 +42,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_tube_65c102_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_65c102_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", M65C02, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp
index da84e68255d..d64eaa47213 100644
--- a/src/devices/bus/bbc/tube/tube_80186.cpp
+++ b/src/devices/bus/bbc/tube/tube_80186.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_tube_80186_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_80186_device::device_add_mconfig)
MCFG_CPU_ADD("i80186", I80186, XTAL_20MHz / 2)
MCFG_CPU_PROGRAM_MAP(tube_80186_mem)
MCFG_CPU_IO_MAP(tube_80186_io)
diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp
index 21952c4fc8e..7701b2e0ce2 100644
--- a/src/devices/bus/bbc/tube/tube_80286.cpp
+++ b/src/devices/bus/bbc/tube/tube_80286.cpp
@@ -55,7 +55,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_tube_80286_device::device_add_mconfig)
+MACHINE_CONFIG_START(bbc_tube_80286_device::device_add_mconfig)
MCFG_CPU_ADD("i80286", I80286, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(tube_80286_mem)
MCFG_CPU_IO_MAP(tube_80286_io)
diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp
index 7243f2989c7..d23131674cb 100644
--- a/src/devices/bus/bbc/tube/tube_arm.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm.cpp
@@ -49,7 +49,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_tube_arm_device::device_add_mconfig)
+MACHINE_CONFIG_START(bbc_tube_arm_device::device_add_mconfig)
MCFG_CPU_ADD("arm", ARM, XTAL_20MHz / 3)
MCFG_CPU_PROGRAM_MAP(tube_arm_mem)
diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp
index ddff65c6e6b..af49f67c5f9 100644
--- a/src/devices/bus/bbc/tube/tube_casper.cpp
+++ b/src/devices/bus/bbc/tube/tube_casper.cpp
@@ -47,7 +47,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_tube_casper_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_casper_device::device_add_mconfig)
MCFG_CPU_ADD("m68000", M68000, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(tube_casper_mem)
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index f1a346b3617..668220320e4 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -58,7 +58,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bbc_tube_z80_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_z80_device::device_add_mconfig)
MCFG_CPU_ADD("z80", Z80, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(tube_z80_mem)
MCFG_CPU_DECRYPTED_OPCODES_MAP(tube_z80_fetch)
diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp
index 10d98399e08..2f9525aa4a0 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.cpp
+++ b/src/devices/bus/bbc/tube/tube_zep100.cpp
@@ -55,7 +55,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(bbc_tube_zep100_device::device_add_mconfig )
+MACHINE_CONFIG_START(bbc_tube_zep100_device::device_add_mconfig)
MCFG_CPU_ADD("z80", Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(tube_zep100_mem)
MCFG_CPU_IO_MAP(tube_zep100_io)
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index 25c53e2181f..698fa6dd6a1 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bml3bus_mp1802_device::device_add_mconfig )
+MACHINE_CONFIG_START(bml3bus_mp1802_device::device_add_mconfig)
MCFG_MB8866_ADD("fdc", XTAL_1MHz)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w))
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index 961f008c838..85f7961a601 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -54,7 +54,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bml3bus_mp1805_device::device_add_mconfig )
+MACHINE_CONFIG_START(bml3bus_mp1805_device::device_add_mconfig)
MCFG_DEVICE_ADD( "mc6843", MC6843, 0 )
MCFG_MC6843_IRQ_CALLBACK(WRITELINE(bml3bus_mp1805_device, bml3_mc6843_intrq_w))
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(bml3_mp1805_floppy_interface)
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index 985272d247e..4b23cb663f7 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(C64_16KB, c64_16kb_cartridge_device, "c64_16kb", "C64 16KB EP
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_16kb_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_16kb_cartridge_device::device_add_mconfig)
MCFG_GENERIC_CARTSLOT_ADD("roml", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin,80")
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index 2d0ecbc67d9..bb23df4b3ec 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -58,7 +58,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_cpm_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_cpm_cartridge_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 3000000)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 83c28b4468a..3f62c5011c2 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -112,7 +112,7 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_currah_speech_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_currah_speech_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(SP0256_TAG, SP0256, 4000000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index 3eb8951b559..e11b3ae8f53 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP256, c64_dela_ep256_cartridge_device, "delep256",
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_dela_ep256_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_dela_ep256_cartridge_device::device_add_mconfig)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index a817fac13f1..c9eee384a5a 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP64, c64_dela_ep64_cartridge_device, "c64_dela_ep64
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_dela_ep64_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_dela_ep64_cartridge_device::device_add_mconfig)
MCFG_GENERIC_SOCKET_ADD("eprom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin")
MCFG_GENERIC_SOCKET_ADD("eprom2", generic_linear_slot, nullptr)
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index 531e91e58c2..564e7196449 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP7X8, c64_dela_ep7x8_cartridge_device, "c64_dela_ep
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_dela_ep7x8_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_dela_ep7x8_cartridge_device::device_add_mconfig)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index acef92afdec..0660e562dc3 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(C64_EASYFLASH, c64_easyflash_cartridge_device, "c64_easyflash
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_easyflash_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_easyflash_cartridge_device::device_add_mconfig)
MCFG_AMD_29F040_ADD(AM29F040_0_TAG)
MCFG_AMD_29F040_ADD(AM29F040_1_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index bcc90726d6c..3dfda72f137 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_final_chesscard_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_final_chesscard_device::device_add_mconfig)
MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(c64_fcc_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index 1263b8203d9..bae3e43ad94 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(C64_GEOCABLE, c64_geocable_device, "c64_geocable", "C64 geoCa
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_geocable_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_geocable_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(c64_geocable_device, output_b))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index a50176780f8..22291412210 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(C64_IDE64, c64_ide64_cartridge_device, "c64_ide64", "C64 IDE6
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_ide64_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_ide64_cartridge_device::device_add_mconfig)
MCFG_ATMEL_29C010_ADD(AT29C010A_TAG)
MCFG_DS1302_ADD(DS1302_TAG, XTAL_32_768kHz)
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index 00a4e4c1893..3cbb3c8107b 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -141,7 +141,7 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_ieee488_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_ieee488_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6525_TAG, TPI6525, 0)
MCFG_TPI6525_IN_PA_CB(READ8(c64_ieee488_device, tpi_pa_r))
MCFG_TPI6525_OUT_PA_CB(WRITE8(c64_ieee488_device, tpi_pa_w))
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index 918a799296a..faec481505e 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -96,7 +96,7 @@ WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_magic_formel_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_magic_formel_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pb_w))
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index a9439244e84..cd507231fc1 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -219,7 +219,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::apd_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_magic_voice_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_magic_voice_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6525_TAG, TPI6525, 0)
MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_irq_w))
MCFG_TPI6525_IN_PA_CB(READ8(c64_magic_voice_cartridge_device, tpi_pa_r))
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 5e5b751ecc6..2e074194213 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -44,7 +44,7 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::write_acia_clock )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_maplin_midi_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_maplin_midi_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(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 db32a283189..5a03ef967b4 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -44,7 +44,7 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_namesoft_midi_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_namesoft_midi_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(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 34c77eeef28..ff1c292110b 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -58,7 +58,7 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_passport_midi_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_passport_midi_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_passport_midi_cartridge_device, acia_irq_w))
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index ef4e79e0f53..f78e5155c4a 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -44,7 +44,7 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::write_acia_clock )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_sequential_midi_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_sequential_midi_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(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 d4b56e90535..0b705bfa1ce 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -44,7 +44,7 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::write_acia_clock )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_siel_midi_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_siel_midi_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_siel_midi_cartridge_device, acia_irq_w))
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index e99eb9ef7b8..0e2687b4f9d 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_multiscreen_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_multiscreen_cartridge_device::device_add_mconfig)
MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(multiscreen_mem)
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 923c9982f3b..faba193c120 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(C64_MUSIC64, c64_music64_cartridge_device, "c64_music64", "C6
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_music64_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_music64_cartridge_device::device_add_mconfig)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index 551932a13c8..b70c8a61c0f 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -75,7 +75,7 @@ static struct votrax_sc02_interface votrax_intf =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_ps64_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_ps64_cartridge_device::device_add_mconfig)
//MCFG_SPEAKER_STANDARD_MONO("mono")
//MCFG_VOTRAX_SC02_ADD(SSI263_TAG, 2000000, votrax_intf)
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index 01b371392c7..b7ab238e47e 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(C64_REU1764, c64_reu1764_cartridge_device, "c64_1764reu", "17
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_reu_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_reu_cartridge_device::device_add_mconfig)
MCFG_MOS8726_ADD(MOS8726R1_TAG)
MCFG_GENERIC_SOCKET_ADD("rom", generic_linear_slot, nullptr)
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index 7dc3bc27520..67f1ce015b9 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(C64_REX_EP256, c64_rex_ep256_cartridge_device, "rexexp256", "
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_rex_ep256_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_rex_ep256_cartridge_device::device_add_mconfig)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 6d7dffd2b49..a284abfd0fc 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -41,7 +41,7 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_sfx_sound_expander_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_sfx_sound_expander_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz)
MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w))
diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp
index 1c5dd398482..6f50af714e4 100644
--- a/src/devices/bus/c64/speakeasy.cpp
+++ b/src/devices/bus/c64/speakeasy.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(C64_SPEAKEASY, c64_speakeasy_cartridge_device, "c64_speakeasy
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_speakeasy_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_speakeasy_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index 6b5b73b3265..bff7a356a9c 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -60,7 +60,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_supercpu_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_supercpu_device::device_add_mconfig)
MCFG_CPU_ADD(G65816_TAG, G65816, 1000000)
MCFG_CPU_PROGRAM_MAP(c64_supercpu_map)
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 7d7f65a62b3..2dd8d26147f 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_swiftlink_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_swiftlink_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL_3_6864MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index f8852e2b51b..d42666401f8 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -153,7 +153,7 @@ DEFINE_DEVICE_TYPE(C64_TDOS, c64_tdos_cartridge_device, "c64_tdos", "C64 TDOS ca
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_tdos_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_tdos_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL_6_5MHz)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index 8da2ccb1c5e..e268511349d 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232",
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_turbo232_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_turbo232_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL_3_6864MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 3469a60f1c7..8474fee85a5 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -123,7 +123,7 @@ GFXDECODE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c64_xl80_device::device_add_mconfig )
+MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*8)
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index 0439759d928..5b33da81864 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -86,7 +86,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cbm2_hrg_a_device::device_add_mconfig )
+MACHINE_CONFIG_START(cbm2_hrg_a_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 512)
@@ -102,7 +102,7 @@ MACHINE_CONFIG_MEMBER( cbm2_hrg_a_device::device_add_mconfig )
MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_512x512);
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( cbm2_hrg_b_device::device_add_mconfig )
+MACHINE_CONFIG_START(cbm2_hrg_b_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 256)
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index d83547423c5..53d14803fe9 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -87,7 +87,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c1526_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1526_device::device_add_mconfig)
MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
@@ -97,7 +97,7 @@ MACHINE_CONFIG_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c4023_device::device_add_mconfig )
+MACHINE_CONFIG_START(c4023_device::device_add_mconfig)
MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 427cebe1e31..2c11785c946 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -811,7 +811,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c1541_device_base::device_add_mconfig )
+MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c1541_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -840,12 +840,12 @@ MACHINE_CONFIG_MEMBER( c1541_device_base::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1541c_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1541c_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1541_dolphin_dos_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1541_dolphin_dos_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
MCFG_CPU_MODIFY(M6502_TAG)
@@ -853,7 +853,7 @@ MACHINE_CONFIG_MEMBER( c1541_dolphin_dos_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1541_professional_dos_v1_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1541_professional_dos_v1_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
MCFG_CPU_MODIFY(M6502_TAG)
@@ -861,7 +861,7 @@ MACHINE_CONFIG_MEMBER( c1541_professional_dos_v1_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1541_prologic_dos_classic_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1541_prologic_dos_classic_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
MCFG_CPU_MODIFY(M6502_TAG)
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 686b2028b39..8d85be61809 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -600,7 +600,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c1570_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -636,7 +636,7 @@ MACHINE_CONFIG_MEMBER( c1570_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1571_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -672,7 +672,7 @@ MACHINE_CONFIG_MEMBER( c1571_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c1571cr_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -702,7 +702,7 @@ MACHINE_CONFIG_MEMBER( c1571cr_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( mini_chief_device::device_add_mconfig )
+MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(mini_chief_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index e0a521a7b5b..52e22cfe725 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -265,7 +265,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c1581_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1581_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8)
MCFG_CPU_PROGRAM_MAP(c1581_mem)
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 41c1c86a54d..18fffca8d8d 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -76,7 +76,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cmd_hd_device::device_add_mconfig )
+MACHINE_CONFIG_START(cmd_hd_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, 2000000)
MCFG_CPU_PROGRAM_MAP(cmd_hd_mem)
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 442d99a6f4a..2f637199896 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -211,7 +211,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( fd2000_device::device_add_mconfig )
+MACHINE_CONFIG_START(fd2000_device::device_add_mconfig)
MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL_24MHz/12)
MCFG_CPU_PROGRAM_MAP(fd2000_mem)
@@ -227,7 +227,7 @@ MACHINE_CONFIG_MEMBER( fd2000_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( fd4000_device::device_add_mconfig )
+MACHINE_CONFIG_START(fd4000_device::device_add_mconfig)
MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL_24MHz/6)
MCFG_CPU_PROGRAM_MAP(fd4000_mem)
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index 7cceb9ed970..ceaaad1341f 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -122,7 +122,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( interpod_device::device_add_mconfig )
+MACHINE_CONFIG_START(interpod_device::device_add_mconfig)
MCFG_CPU_ADD(R6502_TAG, M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(interpod_mem)
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 686710c3055..92f4f6e2226 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -68,7 +68,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( serial_box_device::device_add_mconfig )
+MACHINE_CONFIG_START(serial_box_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(serial_box_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index ed1cce88d02..93d76fcfced 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -59,7 +59,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic1515_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic1515_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", I8039, XTAL_6MHz)
MCFG_CPU_PROGRAM_MAP(vic1515_mem)
MCFG_CPU_IO_MAP(vic1515_io)
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 4817741166a..3e5c48cae00 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -93,7 +93,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic1520_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic1520_device::device_add_mconfig)
MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL_2MHz) // M6500/1
MCFG_CPU_PROGRAM_MAP(vic1520_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbus/mpu_pc98.cpp b/src/devices/bus/cbus/mpu_pc98.cpp
index 489d5779562..be82c7764b4 100644
--- a/src/devices/bus/cbus/mpu_pc98.cpp
+++ b/src/devices/bus/cbus/mpu_pc98.cpp
@@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(MPU_PC98, mpu_pc98_device, "mpu_pc98", "Roland MPU-401 MIDI I
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( mpu_pc98_device::device_add_mconfig )
+MACHINE_CONFIG_START(mpu_pc98_device::device_add_mconfig)
MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(mpu_pc98_device, mpu_irq_out))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp
index 79e9195167a..d5cb715035a 100644
--- a/src/devices/bus/cbus/pc9801_118.cpp
+++ b/src/devices/bus/cbus/pc9801_118.cpp
@@ -50,7 +50,7 @@ WRITE_LINE_MEMBER(pc9801_118_device::pc9801_sound_irq)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc9801_118_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc9801_118_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually
MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_118_device, pc9801_sound_irq))
diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp
index 5a2b8bb611b..57fa3e8b888 100644
--- a/src/devices/bus/cbus/pc9801_26.cpp
+++ b/src/devices/bus/cbus/pc9801_26.cpp
@@ -51,7 +51,7 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc9801_26_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc9801_26_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider
MCFG_YM2203_IRQ_HANDLER(WRITELINE(pc9801_26_device, pc9801_sound_irq))
diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp
index cad2d56c505..8469e8f16c4 100644
--- a/src/devices/bus/cbus/pc9801_86.cpp
+++ b/src/devices/bus/cbus/pc9801_86.cpp
@@ -53,7 +53,7 @@ WRITE_LINE_MEMBER(pc9801_86_device::sound_irq)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc9801_86_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc9801_86_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider
MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_86_device, sound_irq))
diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp
index 4f0518f0e89..6442f13c3ab 100644
--- a/src/devices/bus/cbus/pc9801_amd98.cpp
+++ b/src/devices/bus/cbus/pc9801_amd98.cpp
@@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(PC9801_AMD98, pc9801_amd98_device, "pc9801_amd98", "pc9801_am
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc9801_amd98_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc9801_amd98_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK_X1*2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("OPN_PA1"))
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 7fa35d5b117..ff4beb5999f 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -98,7 +98,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( comx_pl80_device::device_add_mconfig )
+MACHINE_CONFIG_START(comx_pl80_device::device_add_mconfig)
MCFG_CPU_ADD(CX005_TAG, M6805, 4000000) // CX005: some kind of MC6805/MC68HC05 clone
MCFG_CPU_PROGRAM_MAP(comxpl80_mem)
MCFG_CPU_IO_MAP(comxpl80_io)
diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp
index 5b55412a4c8..eb5259c1913 100644
--- a/src/devices/bus/centronics/covox.cpp
+++ b/src/devices/bus/centronics/covox.cpp
@@ -38,7 +38,7 @@ centronics_covox_device::centronics_covox_device(const machine_config &mconfig,
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( centronics_covox_device::device_add_mconfig )
+MACHINE_CONFIG_START(centronics_covox_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
@@ -87,7 +87,7 @@ centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_con
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( centronics_covox_stereo_device::device_add_mconfig )
+MACHINE_CONFIG_START(centronics_covox_stereo_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp
index 050a3840f35..f99cdecb589 100644
--- a/src/devices/bus/centronics/digiblst.cpp
+++ b/src/devices/bus/centronics/digiblst.cpp
@@ -38,7 +38,7 @@ centronics_digiblaster_device::centronics_digiblaster_device(const machine_confi
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( centronics_digiblaster_device::device_add_mconfig )
+MACHINE_CONFIG_START(centronics_digiblaster_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 2c3549f36e0..bbdb310199d 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -214,7 +214,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( epson_ex800_device::device_add_mconfig )
+MACHINE_CONFIG_START(epson_ex800_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", UPD7810, 12000000) /* 12 MHz? */
MCFG_CPU_PROGRAM_MAP(ex800_mem)
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 8fc5168bbb5..b81ba2c88fb 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -65,7 +65,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( epson_lx800_device::device_add_mconfig )
+MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz)
MCFG_CPU_PROGRAM_MAP(lx800_mem)
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index ae44e4a7d57..c2782e451e2 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -108,7 +108,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( epson_lx810l_device::device_add_mconfig )
+MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz)
MCFG_CPU_PROGRAM_MAP(lx810l_mem)
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index ba0276a61fb..b906a7a8c0a 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -48,7 +48,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nec_p72_device::device_add_mconfig )
+MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V33, XTAL_16MHz/2) /* TODO it's actually a V40 */
MCFG_CPU_PROGRAM_MAP(p72_mem)
diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp
index fdc7548438d..67c126a6121 100644
--- a/src/devices/bus/centronics/printer.cpp
+++ b/src/devices/bus/centronics/printer.cpp
@@ -32,7 +32,7 @@ centronics_printer_device::centronics_printer_device(const machine_config &mconf
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( centronics_printer_device::device_add_mconfig )
+MACHINE_CONFIG_START(centronics_printer_device::device_add_mconfig)
MCFG_DEVICE_ADD("printer", PRINTER, 0)
MCFG_PRINTER_ONLINE_CB(WRITELINE(centronics_printer_device, printer_online))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index 78e159d3ac0..bca9110bff5 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -69,7 +69,7 @@ const tiny_rom_entry *cgenie_fdc_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cgenie_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(cgenie_fdc_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25))
MCFG_FD1793_ADD("fd1793", XTAL_1MHz)
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index 740524306bb..bfd901493d9 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(CGENIE_PRINTER, cgenie_printer_device, "cgenie_printer", "Pri
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cgenie_printer_device::device_add_mconfig )
+MACHINE_CONFIG_START(cgenie_printer_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(cgenie_printer_device, busy_w))
MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(cgenie_printer_device, perror_w))
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp
index 77206445bb0..4e7a12081ff 100644
--- a/src/devices/bus/coco/coco_dcmodem.cpp
+++ b/src/devices/bus/coco/coco_dcmodem.cpp
@@ -83,7 +83,7 @@ namespace
IMPLEMENTATION
***************************************************************************/
-MACHINE_CONFIG_MEMBER(coco_dc_modem_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_dc_modem_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(coco_dc_modem_device, uart_irq_w))
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 01f91976db2..be84d919982 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -121,7 +121,7 @@ static SLOT_INTERFACE_START( coco_fdc_floppies )
SLOT_INTERFACE("qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER(coco_fdc_device_base::device_add_mconfig )
+MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig)
MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_drq_w))
diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp
index 3c257e2b3ef..75d6c28669e 100644
--- a/src/devices/bus/coco/coco_gmc.cpp
+++ b/src/devices/bus/coco/coco_gmc.cpp
@@ -51,7 +51,7 @@ namespace
};
-MACHINE_CONFIG_MEMBER(coco_pak_gmc_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("gmc_speaker")
MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_4MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0)
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index 8ac57f25f48..3b3ec13f0ca 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -166,7 +166,7 @@ static SLOT_INTERFACE_START(coco_cart_slot4)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER(coco_multipak_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_multipak_device::device_add_mconfig)
MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, coco_cart_slot1_3, nullptr)
MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_nmi_w))
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index 1263ea8f8d5..08c9fa5d859 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -107,7 +107,7 @@ namespace
// MACHINE AND ROM DECLARATIONS
//**************************************************************************
-MACHINE_CONFIG_MEMBER(coco_orch90_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_orch90_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // ls374.ic5 + r7 (8x20k) + r9 (8x10k)
MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // ls374.ic4 + r6 (8x20k) + r8 (8x10k)
diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp
index fa6344f05b9..c6bf6bd0c23 100644
--- a/src/devices/bus/coco/coco_rs232.cpp
+++ b/src/devices/bus/coco/coco_rs232.cpp
@@ -67,7 +67,7 @@ namespace
IMPLEMENTATION
***************************************************************************/
-MACHINE_CONFIG_MEMBER(coco_rs232_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_rs232_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index a5d0f4f2d3f..2397af5aa14 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -152,7 +152,7 @@ DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sou
// MACHINE FRAGMENTS AND ADDRESS MAPS
//**************************************************************************
-MACHINE_CONFIG_MEMBER(coco_ssc_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
MCFG_CPU_ADD(PIC_TAG, TMS7040, DERIVED_CLOCK(2, 1))
MCFG_TMS7000_IN_PORTA_CB(READ8(coco_ssc_device, ssc_port_a_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(coco_ssc_device, ssc_port_b_w))
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 5adc451d18a..7a79343b5b5 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -149,7 +149,7 @@ namespace
IMPLEMENTATION
***************************************************************************/
-MACHINE_CONFIG_MEMBER(coco_t4426_device::device_add_mconfig)
+MACHINE_CONFIG_START(coco_t4426_device::device_add_mconfig)
MCFG_DEVICE_ADD(PIA_TAG, PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_t4426_device, pia_A_w))
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index 02cf92bd9ac..675485d9f54 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -145,7 +145,7 @@ static SLOT_INTERFACE_START(dragon_fdc_device_base)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER(dragon_fdc_device_base::device_add_mconfig)
+MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig)
MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_drq_w))
@@ -162,7 +162,7 @@ MACHINE_CONFIG_MEMBER(dragon_fdc_device_base::device_add_mconfig)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER(premier_fdc_device_base::device_add_mconfig)
+MACHINE_CONFIG_START(premier_fdc_device_base::device_add_mconfig)
MCFG_WD2791_ADD(WD2791_TAG, XTAL_2MHz / 2)
MCFG_WD_FDC_FORCE_READY
diff --git a/src/devices/bus/coco/dragon_jcbsnd.cpp b/src/devices/bus/coco/dragon_jcbsnd.cpp
index 21cac2b57f1..4bb8502488a 100644
--- a/src/devices/bus/coco/dragon_jcbsnd.cpp
+++ b/src/devices/bus/coco/dragon_jcbsnd.cpp
@@ -80,7 +80,7 @@ uint8_t* dragon_jcbsnd_device::get_cart_base()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dragon_jcbsnd_device::device_add_mconfig )
+MACHINE_CONFIG_START(dragon_jcbsnd_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8910", AY8910, DERIVED_CLOCK(1, 1)) /* AY-3-8910 - clock not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp
index bdfe930dc5c..33e7681b803 100644
--- a/src/devices/bus/compis/hrg.cpp
+++ b/src/devices/bus/compis/hrg.cpp
@@ -75,7 +75,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( compis_uhrg_device::display_pixels )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( compis_hrg_device::device_add_mconfig )
+MACHINE_CONFIG_START(compis_hrg_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -93,7 +93,7 @@ MACHINE_CONFIG_MEMBER( compis_hrg_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( compis_uhrg_device::device_add_mconfig )
+MACHINE_CONFIG_START(compis_uhrg_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(50)
diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp
index d7702286d48..af789ea7e43 100644
--- a/src/devices/bus/compucolor/floppy.cpp
+++ b/src/devices/bus/compucolor/floppy.cpp
@@ -50,7 +50,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( compucolor_floppy_device::device_add_mconfig )
+MACHINE_CONFIG_START(compucolor_floppy_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD_FIXED("floppy", compucolor_floppies, "525sssd", compucolor_floppy_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index ad371e94f41..7e692069baa 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -136,7 +136,7 @@ GFXDECODE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( comx_clm_device::device_add_mconfig )
+MACHINE_CONFIG_START(comx_clm_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*8)
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index 25d5c647f60..83ce1a980d1 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -98,7 +98,7 @@ const tiny_rom_entry *comx_eb_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( comx_eb_device::device_add_mconfig )
+MACHINE_CONFIG_START(comx_eb_device::device_add_mconfig)
MCFG_COMX_EXPANSION_SLOT_ADD(SLOT1_TAG, comx_expansion_cards, "fd")
MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot1_irq_w))
MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, comx_expansion_cards, "clm")
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index 0fbe31a7295..de9267969d9 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -95,7 +95,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( comx_fd_device::device_add_mconfig )
+MACHINE_CONFIG_START(comx_fd_device::device_add_mconfig)
MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats)
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index b1e5f065070..969acc35b10 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -55,7 +55,7 @@ const tiny_rom_entry *comx_prn_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( comx_prn_device::device_add_mconfig )
+MACHINE_CONFIG_START(comx_prn_device::device_add_mconfig)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit0))
MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index d6e929bb7b6..bf11fb5e095 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -20,7 +20,7 @@
DEFINE_DEVICE_TYPE(CPC_AMDRUM, cpc_amdrum_device, "cpc_amdrum", "Amdrum")
-MACHINE_CONFIG_MEMBER( cpc_amdrum_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_amdrum_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index d897b682c51..4687e2366a3 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -17,7 +17,7 @@
DEFINE_DEVICE_TYPE(CPC_PDS, cpc_pds_device, "cpc_pds", "Programmers Development System (CPC Target)")
-MACHINE_CONFIG_MEMBER( cpc_pds_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_pds_device::device_add_mconfig)
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock
// no pass-through seen on remake PCBs, unknown if actual hardware had a pass-through port or not
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index 86625aced56..cb71e375db8 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -18,7 +18,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_rom_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_rom_device::device_add_mconfig)
MCFG_CPC_ROMSLOT_ADD("rom1")
MCFG_CPC_ROMSLOT_ADD("rom2")
MCFG_CPC_ROMSLOT_ADD("rom3")
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index dd7f78af667..b187e514e6a 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -33,7 +33,7 @@ ROM_START( cpc_rs232_ams )
ROM_END
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_rs232_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_rs232_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(2000000)
MCFG_PIT8253_CLK1(2000000)
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index 3cfbd98d397..aa9ade4b124 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -115,7 +115,7 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const
}
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_ssa1_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("sp0256",SP0256,XTAL_3_12MHz)
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_ssa1_device, lrq_cb))
@@ -131,7 +131,7 @@ MACHINE_CONFIG_MEMBER( cpc_ssa1_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( cpc_dkspeech_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("sp0256",SP0256,XTAL_4MHz) // uses the CPC's clock from pin 50 of the expansion port
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_dkspeech_device, lrq_cb))
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index 0dc2de0604c..7364e899efb 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *cpc_ddi1_device::device_rom_region() const
}
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_ddi1_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_ddi1_device::device_add_mconfig)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", ddi1_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","cpc_flop")
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index e4073b93cf8..a409cc475a6 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -16,7 +16,7 @@
DEFINE_DEVICE_TYPE(CPC_DOUBLER, cpc_doubler_device, "cpc_doubler", "Draysoft Doubler")
-MACHINE_CONFIG_MEMBER( cpc_doubler_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_doubler_device::device_add_mconfig)
MCFG_CASSETTE_ADD( "doubler_tape" )
MCFG_CASSETTE_FORMATS(cdt_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED)
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index 7b3dbccaa7d..a9e14adb6ca 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -15,7 +15,7 @@
DEFINE_DEVICE_TYPE(CPC_HD20, cpc_hd20_device, "cpc_hd20", "Dobbertin HD20")
-MACHINE_CONFIG_MEMBER( cpc_hd20_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_hd20_device::device_add_mconfig)
MCFG_DEVICE_ADD("hdc",ST11M_HDC,0)
MCFG_XTHDC_IRQ_HANDLER(WRITELINE(cpc_hd20_device, irq_w))
MCFG_HARDDISK_ADD("hdc:primary")
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index 5f44afedb9e..c62aa4313dd 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -20,7 +20,7 @@
DEFINE_DEVICE_TYPE(AL_MAGICSOUND, al_magicsound_device, "al_magicsound", "Aleste Magic Sound Board")
-MACHINE_CONFIG_MEMBER( al_magicsound_device::device_add_mconfig )
+MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL_4MHz ) // CLK from expansion port
// According to the schematics, the TC pin (EOP on western chips) is connected to NMI on the expansion port.
// NMIs seem to occur too quickly when this is active, so either EOP is not triggered at the correct time, or
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index 422d3dec6b7..7991a901f18 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -108,7 +108,7 @@ void cpc_multiface2_device::multiface_rethink_memory()
}
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_multiface2_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_multiface2_device::device_add_mconfig)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 11bbd2a6693..ca165673e26 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -24,7 +24,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
DEFINE_DEVICE_TYPE(CPC_PLAYCITY, cpc_playcity_device, "cpc_playcity", "PlayCity")
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_playcity_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_playcity_device::device_add_mconfig)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
MCFG_Z80CTC_ZC1_CB(WRITELINE(cpc_playcity_device, ctc_zc1_cb))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc",z80ctc_device, trg3))
diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp
index eb3e9946401..ec839b6a12b 100644
--- a/src/devices/bus/cpc/smartwatch.cpp
+++ b/src/devices/bus/cpc/smartwatch.cpp
@@ -19,7 +19,7 @@
DEFINE_DEVICE_TYPE(CPC_SMARTWATCH, cpc_smartwatch_device, "cpc_smartwatch", "Dobbertin Smartwatch")
-MACHINE_CONFIG_MEMBER( cpc_smartwatch_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_smartwatch_device::device_add_mconfig)
MCFG_DS1315_ADD("rtc")
// no pass-through (?)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index b580d93021c..3b9e6d7554b 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -51,7 +51,7 @@ static INPUT_PORTS_START(cpc_symbiface2)
INPUT_PORTS_END
// device machine config
-MACHINE_CONFIG_MEMBER( cpc_symbiface2_device::device_add_mconfig )
+MACHINE_CONFIG_START(cpc_symbiface2_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD("ide", ata_devices, "hdd", nullptr, false)
MCFG_DS12885_ADD("rtc")
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index c6d1301b3f5..776a3970fdd 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -73,7 +73,7 @@ void dmv_k210_device::device_timer(emu_timer &timer, device_timer_id tid, int pa
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k210_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k210_device::device_add_mconfig)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(dmv_k210_device, porta_r))
MCFG_I8255_IN_PORTB_CB(READ8(dmv_k210_device, portb_r))
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index c38145bf3d5..b449d4d8dc3 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -155,7 +155,7 @@ void dmv_k220_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k220_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k220_device::device_add_mconfig)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(dmv_k220_device, porta_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SWITCH"))
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index 96ec71b182a..a21e4e12aae 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -162,18 +162,18 @@ void dmv_k234_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k230_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k230_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3)
MCFG_CPU_PROGRAM_MAP(k230_mem)
MCFG_CPU_IO_MAP(k230_io)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( dmv_k234_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k234_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", M68008, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(k234_mem)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( dmv_k235_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k235_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3)
MCFG_CPU_PROGRAM_MAP(k230_mem)
MCFG_CPU_IO_MAP(k235_io)
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index f82a644654a..fdb33c2e427 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -142,7 +142,7 @@ void dmv_k801_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k801_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k801_device::device_add_mconfig)
MCFG_DEVICE_ADD("epci", MC2661, XTAL_5_0688MHz)
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -157,21 +157,21 @@ MACHINE_CONFIG_MEMBER( dmv_k801_device::device_add_mconfig )
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("epci", mc2661_device, cts_w))
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( dmv_k211_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k211_device::device_add_mconfig)
dmv_k801_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("rs232")
MCFG_SLOT_DEFAULT_OPTION("null_modem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( dmv_k212_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k212_device::device_add_mconfig)
dmv_k801_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("rs232")
MCFG_SLOT_DEFAULT_OPTION("printer")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( dmv_k213_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k213_device::device_add_mconfig)
dmv_k801_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("rs232")
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index faeb0cdcac5..2e46256e9e9 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -75,7 +75,7 @@ void dmv_k803_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k803_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k803_device::device_add_mconfig)
MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
MCFG_MM58167_IRQ_CALLBACK(WRITELINE(dmv_k803_device, rtc_irq_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 4c6f22d8d87..48758217e3c 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -100,7 +100,7 @@ void dmv_k806_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dmv_k806_device::device_add_mconfig )
+MACHINE_CONFIG_START(dmv_k806_device::device_add_mconfig)
MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz)
MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_k806_device, port1_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_k806_device, port2_w))
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 7b437ccf8c5..2b6556b54a7 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -457,7 +457,7 @@ void ecb_grip21_device::kb_w(uint8_t data)
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ecb_grip21_device::device_add_mconfig )
+MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_Z80_DAISY_CHAIN(grip_daisy_chain)
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 0a5f8eef283..5cb5c6704c9 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( econet_e01_device::device_add_mconfig )
+MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL_8MHz/4) // Rockwell R65C102P3
MCFG_CPU_PROGRAM_MAP(e01_mem)
diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp
index 51918b018ca..bf05dc5e846 100644
--- a/src/devices/bus/einstein/pipe/speculator.cpp
+++ b/src/devices/bus/einstein/pipe/speculator.cpp
@@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(EINSTEIN_SPECULATOR, einstein_speculator_device, "einstein_sp
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( einstein_speculator_device::device_add_mconfig )
+MACHINE_CONFIG_START(einstein_speculator_device::device_add_mconfig)
MCFG_DEVICE_ADD("ic5a", TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
MCFG_TTL74123_RESISTOR_VALUE(RES_K(47))
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index 9af704c2f2b..763181c2ed8 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -95,7 +95,7 @@ GFXDECODE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( tk02_device::device_add_mconfig )
+MACHINE_CONFIG_START(tk02_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME("mono", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz * 2, 1024, 0, 640, 312, 0, 250)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
diff --git a/src/devices/bus/einstein/userport/speech.cpp b/src/devices/bus/einstein/userport/speech.cpp
index b98e5d5513e..b2713641ce1 100644
--- a/src/devices/bus/einstein/userport/speech.cpp
+++ b/src/devices/bus/einstein/userport/speech.cpp
@@ -37,7 +37,7 @@ const tiny_rom_entry *einstein_speech_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( einstein_speech_device::device_add_mconfig )
+MACHINE_CONFIG_START(einstein_speech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("sp0256", SP0256, 3120000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index 8d72ddc52c4..918d73e3670 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -54,7 +54,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( electron_m2105_device::device_add_mconfig )
+MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/devices/bus/electron/plus1.cpp b/src/devices/bus/electron/plus1.cpp
index 839b175fcd3..c84f7d5aa66 100644
--- a/src/devices/bus/electron/plus1.cpp
+++ b/src/devices/bus/electron/plus1.cpp
@@ -90,7 +90,7 @@ ioport_constructor electron_plus1_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( electron_plus1_device::device_add_mconfig )
+MACHINE_CONFIG_START(electron_plus1_device::device_add_mconfig)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(electron_plus1_device, busy_w))
diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp
index 6da70b7cf62..0f00958fd75 100644
--- a/src/devices/bus/electron/plus3.cpp
+++ b/src/devices/bus/electron/plus3.cpp
@@ -64,7 +64,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( electron_plus3_device::device_add_mconfig )
+MACHINE_CONFIG_START(electron_plus3_device::device_add_mconfig)
/* fdc */
MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2)
MCFG_FLOPPY_DRIVE_ADD_FIXED("fdc:0", electron_floppies, "35dd", floppy_formats)
diff --git a/src/devices/bus/electron/rombox.cpp b/src/devices/bus/electron/rombox.cpp
index 39ab61e1bc2..e5a1e2bff27 100644
--- a/src/devices/bus/electron/rombox.cpp
+++ b/src/devices/bus/electron/rombox.cpp
@@ -47,7 +47,7 @@ ioport_constructor electron_rombox_device::device_input_ports() const
return INPUT_PORTS_NAME( rombox );
}
-MACHINE_CONFIG_MEMBER( electron_rombox_device::device_add_mconfig )
+MACHINE_CONFIG_START(electron_rombox_device::device_add_mconfig)
/* rom sockets */
MCFG_GENERIC_SOCKET_ADD("rom1", generic_plain_slot, "electron_rom")
MCFG_GENERIC_EXTENSIONS("bin,rom")
diff --git a/src/devices/bus/electron/romboxp.cpp b/src/devices/bus/electron/romboxp.cpp
index 7a9c171703e..1baf1cdc99f 100644
--- a/src/devices/bus/electron/romboxp.cpp
+++ b/src/devices/bus/electron/romboxp.cpp
@@ -75,7 +75,7 @@ ioport_constructor electron_romboxp_device::device_input_ports() const
return INPUT_PORTS_NAME( romboxp );
}
-MACHINE_CONFIG_MEMBER( electron_romboxp_device::device_add_mconfig )
+MACHINE_CONFIG_START(electron_romboxp_device::device_add_mconfig)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(electron_romboxp_device, busy_w))
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index d69858dc395..931ae243aa1 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -102,7 +102,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ep64_exdos_device::device_add_mconfig )
+MACHINE_CONFIG_START(ep64_exdos_device::device_add_mconfig)
MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats)
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 16eb89c988a..ac0e8e1884e 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -63,7 +63,7 @@ static SLOT_INTERFACE_START( pf10_floppies )
SLOT_INTERFACE( "smd165", EPSON_SMD_165 )
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( epson_pf10_device::device_add_mconfig )
+MACHINE_CONFIG_START(epson_pf10_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", HD6303Y, XTAL_4_9152MHz) // HD63A03XF
MCFG_CPU_PROGRAM_MAP(cpu_mem)
MCFG_CPU_IO_MAP(cpu_io)
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index 6c4fd311f4b..f50c5c7af89 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -83,7 +83,7 @@ static SLOT_INTERFACE_START( tf20_floppies )
SLOT_INTERFACE( "sd320", EPSON_SD_320 )
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( epson_tf20_device::device_add_mconfig )
+MACHINE_CONFIG_START(epson_tf20_device::device_add_mconfig)
MCFG_CPU_ADD("19b", Z80, XTAL_CR1 / 2) /* uPD780C */
MCFG_CPU_PROGRAM_MAP(cpu_mem)
MCFG_CPU_IO_MAP(cpu_io)
diff --git a/src/devices/bus/gamate/rom.cpp b/src/devices/bus/gamate/rom.cpp
index 59a70b3a9a9..18499332bff 100644
--- a/src/devices/bus/gamate/rom.cpp
+++ b/src/devices/bus/gamate/rom.cpp
@@ -168,7 +168,7 @@ WRITE8_MEMBER(gamate_rom_4in1_device::write_rom)
}
}
-MACHINE_CONFIG_MEMBER( gamate_rom_plain_device::device_add_mconfig )
+MACHINE_CONFIG_START(gamate_rom_plain_device::device_add_mconfig)
MCFG_DEVICE_ADD("protection", GAMATE_PROT, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index a2aa9f222dc..9ed7abd6571 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -80,7 +80,7 @@ READ32_MEMBER( sms_ctrl_adaptor_device::pixel_r )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sms_ctrl_adaptor_device::device_add_mconfig )
+MACHINE_CONFIG_START(sms_ctrl_adaptor_device::device_add_mconfig)
MCFG_SMS_CONTROL_PORT_ADD("ctrl", sms_control_port_devices, "joypad")
MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_ctrl_adaptor_device, th_pin_w))
MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_ctrl_adaptor_device, pixel_r))
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 3306b7baa67..0824e1fbd0a 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -404,7 +404,7 @@ void gba_rom_wariotws_device::gpio_dev_write(uint16_t data, int gpio_dirs)
Carts with Flash RAM
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( gba_rom_flash_device::device_add_mconfig )
+MACHINE_CONFIG_START(gba_rom_flash_device::device_add_mconfig)
MCFG_PANASONIC_MN63F805MNP_ADD("flash")
MACHINE_CONFIG_END
@@ -450,7 +450,7 @@ WRITE32_MEMBER(gba_rom_flash_device::write_ram)
}
}
-MACHINE_CONFIG_MEMBER( gba_rom_flash1m_device::device_add_mconfig )
+MACHINE_CONFIG_START(gba_rom_flash1m_device::device_add_mconfig)
MCFG_SANYO_LE26FV10N1TS_ADD("flash")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h
index 9a67786d68a..fada3158273 100644
--- a/src/devices/bus/generic/slot.h
+++ b/src/devices/bus/generic/slot.h
@@ -86,10 +86,10 @@ enum
static_cast<generic_slot_device *>(device)->set_extensions(_ext);
#define MCFG_GENERIC_LOAD(_class, _method) \
- generic_slot_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ generic_slot_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), this));
#define MCFG_GENERIC_UNLOAD(_class, _method) \
- generic_slot_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ generic_slot_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), this));
diff --git a/src/devices/bus/hexbus/hexbus.cpp b/src/devices/bus/hexbus/hexbus.cpp
index d369f61f88b..907c77fa745 100644
--- a/src/devices/bus/hexbus/hexbus.cpp
+++ b/src/devices/bus/hexbus/hexbus.cpp
@@ -295,7 +295,7 @@ void hexbus_chained_device::bus_write(int dir, uint8_t data)
hexbuscont->write(dir, data);
}
-MACHINE_CONFIG_MEMBER( hexbus_chained_device::device_add_mconfig )
+MACHINE_CONFIG_START(hexbus_chained_device::device_add_mconfig)
MCFG_HEXBUS_ADD("hexbus")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index abc5ad9f7fb..8da82eaff2e 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -327,7 +327,7 @@ const tiny_rom_entry *hp82937_io_card_device::device_rom_region() const
return ROM_NAME(hp82937);
}
-MACHINE_CONFIG_MEMBER(hp82937_io_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(hp82937_io_card_device::device_add_mconfig)
MCFG_CPU_ADD("cpu" , I8049 , XTAL_11MHz)
MCFG_CPU_IO_MAP(cpu_io_map)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(hp82937_io_card_device , t0_r))
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index 8936cf8900c..56d7496d12d 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -361,7 +361,7 @@ const tiny_rom_entry *hp98034_io_card_device::device_rom_region() const
return ROM_NAME(hp98034);
}
-MACHINE_CONFIG_MEMBER(hp98034_io_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(hp98034_io_card_device::device_add_mconfig)
// Clock for NP is generated by a RC oscillator. Manual says its typical frequency
// is around 2 MHz.
MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , 2000000)
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 4011e9b9aea..cc08e339a79 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -754,7 +754,7 @@ const tiny_rom_entry *hp98035_io_card_device::device_rom_region() const
return ROM_NAME(hp98035);
}
-MACHINE_CONFIG_MEMBER(hp98035_io_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(hp98035_io_card_device::device_add_mconfig)
MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(np_program_map)
MCFG_CPU_IO_MAP(np_io_map)
diff --git a/src/devices/bus/hp_dio/hp98544.cpp b/src/devices/bus/hp_dio/hp98544.cpp
index e2b4df56350..96b464a9f86 100644
--- a/src/devices/bus/hp_dio/hp98544.cpp
+++ b/src/devices/bus/hp_dio/hp98544.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(HPDIO_98544, dio16_98544_device, "dio98544", "HP98544 high-re
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( dio16_98544_device::device_add_mconfig )
+MACHINE_CONFIG_START(dio16_98544_device::device_add_mconfig)
MCFG_SCREEN_ADD(HP98544_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, dio16_98544_device, screen_update)
MCFG_SCREEN_SIZE(1024,768)
diff --git a/src/devices/bus/hp_dio/hp98603.cpp b/src/devices/bus/hp_dio/hp98603.cpp
index 3eed88eebe6..a9b9718d7d4 100644
--- a/src/devices/bus/hp_dio/hp98603.cpp
+++ b/src/devices/bus/hp_dio/hp98603.cpp
@@ -53,7 +53,7 @@ ROM_START(hp98603)
ROMX_LOAD("u14.bin", 0xa0001, 65536, CRC(96527d4e) SHA1(6706ab97eab4465ea4fa2d6b07e8107468e83818), ROM_SKIP(1) | ROM_BIOS(2))
ROM_END
-MACHINE_CONFIG_MEMBER( dio16_98603_device::device_add_mconfig )
+MACHINE_CONFIG_START(dio16_98603_device::device_add_mconfig)
MACHINE_CONFIG_END
const tiny_rom_entry *dio16_98603_device::device_rom_region() const
diff --git a/src/devices/bus/hp_dio/hp_dio.h b/src/devices/bus/hp_dio/hp_dio.h
index 483815ab4bb..5e048b7360d 100644
--- a/src/devices/bus/hp_dio/hp_dio.h
+++ b/src/devices/bus/hp_dio/hp_dio.h
@@ -26,13 +26,13 @@
#define MCFG_DIO16_SLOT_ADD(_diotag, _tag, _slot_intf, _def_slot, _fixed) \
MCFG_DEVICE_ADD(_tag, DIO16_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \
- dio16_slot_device::static_set_dio16_slot(*device, owner, _diotag);
+ dio16_slot_device::static_set_dio16_slot(*device, this, _diotag);
#define MCFG_DIO32_CPU(_cputag) \
dio32_device::static_set_cputag(*device, _cputag);
#define MCFG_DIO32_SLOT_ADD(_diotag, _tag, _slot_intf, _def_slot, _fixed) \
MCFG_DEVICE_ADD(_tag, DIO32_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \
- dio32_slot_device::static_set_dio32_slot(*device, owner, _diotag);
+ dio32_slot_device::static_set_dio32_slot(*device, this, _diotag);
#define MCFG_ISA_OUT_IRQ3_CB(_devcb) \
devcb = &dio16_device::set_out_irq3_callback(*device, DEVCB_##_devcb);
diff --git a/src/devices/bus/hp_hil/hp_hil.h b/src/devices/bus/hp_hil/hp_hil.h
index e43d71d6cfd..fe4e8bf9e27 100644
--- a/src/devices/bus/hp_hil/hp_hil.h
+++ b/src/devices/bus/hp_hil/hp_hil.h
@@ -90,7 +90,7 @@
#define MCFG_HP_HIL_SLOT_ADD(_mlc_tag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, HP_HIL_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- hp_hil_slot_device::static_set_hp_hil_slot(*device, owner, _mlc_tag);
+ hp_hil_slot_device::static_set_hp_hil_slot(*device, this, _mlc_tag);
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 3ba4ef1471f..0a74402a923 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -302,7 +302,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c2031_device::device_add_mconfig )
+MACHINE_CONFIG_START(c2031_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c2031_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index f6a6b9a7c04..379152202d2 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -447,7 +447,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c2040_device::device_add_mconfig )
+MACHINE_CONFIG_START(c2040_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
@@ -490,7 +490,7 @@ MACHINE_CONFIG_MEMBER( c2040_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c3040_device::device_add_mconfig )
+MACHINE_CONFIG_START(c3040_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
@@ -533,7 +533,7 @@ MACHINE_CONFIG_MEMBER( c3040_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c4040_device::device_add_mconfig )
+MACHINE_CONFIG_START(c4040_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 2d73ed644ed..88c214a1b06 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -524,7 +524,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c8050_device::device_add_mconfig )
+MACHINE_CONFIG_START(c8050_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
@@ -569,7 +569,7 @@ MACHINE_CONFIG_MEMBER( c8050_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c8250_device::device_add_mconfig )
+MACHINE_CONFIG_START(c8250_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
@@ -615,7 +615,7 @@ MACHINE_CONFIG_MEMBER( c8250_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( c8250lp_device::device_add_mconfig )
+MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
@@ -661,7 +661,7 @@ MACHINE_CONFIG_MEMBER( c8250lp_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sfd1001_device::device_add_mconfig )
+MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 007f64d8710..d4fed8cec5f 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -289,7 +289,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c8280_device::device_add_mconfig )
+MACHINE_CONFIG_START(c8280_device::device_add_mconfig)
MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_12MHz/8)
MCFG_CPU_PROGRAM_MAP(c8280_main_mem)
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index d6f1ea32de2..2f003f5b282 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -368,7 +368,7 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( d9060_device_base::device_add_mconfig )
+MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig)
// DOS
MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(d9060_main_mem)
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 24a26c8ac25..a2256e32fe5 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -265,7 +265,7 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( hardbox_device::device_add_mconfig )
+MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(hardbox_mem)
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 2d2d623aadf..2491112838e 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -882,7 +882,7 @@ const tiny_rom_entry *hp9895_device::device_rom_region() const
return ROM_NAME(hp9895);
}
-MACHINE_CONFIG_MEMBER(hp9895_device::device_add_mconfig)
+MACHINE_CONFIG_START(hp9895_device::device_add_mconfig)
MCFG_CPU_ADD("cpu" , Z80 , 4000000)
MCFG_CPU_PROGRAM_MAP(z80_program_map)
MCFG_CPU_IO_MAP(z80_io_map)
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index 608c133ae36..99690da3875 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -78,7 +78,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( mshark_device::device_add_mconfig )
+MACHINE_CONFIG_START(mshark_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD(I8085_TAG, I8085A, 1000000)
MCFG_CPU_PROGRAM_MAP(mshark_mem)
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index e89378d32b5..2e82ea4d1d1 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -232,7 +232,7 @@ DEVICE_INPUT_DEFAULTS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( softbox_device::device_add_mconfig )
+MACHINE_CONFIG_START(softbox_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(softbox_mem)
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index a2b2c582984..36a5cd9d51f 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -340,7 +340,7 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( imi5000h_device::device_add_mconfig )
+MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
MCFG_CPU_PROGRAM_MAP(imi5000h_mem)
diff --git a/src/devices/bus/interpro/keyboard/hle.cpp b/src/devices/bus/interpro/keyboard/hle.cpp
index a455f9227e3..9bbc2fefe78 100644
--- a/src/devices/bus/interpro/keyboard/hle.cpp
+++ b/src/devices/bus/interpro/keyboard/hle.cpp
@@ -269,7 +269,7 @@ WRITE_LINE_MEMBER(hle_device_base::input_txd)
device_buffered_serial_interface::rx_w(state);
}
-MACHINE_CONFIG_MEMBER(hle_device_base::device_add_mconfig)
+MACHINE_CONFIG_START(hle_device_base::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("bell")
MCFG_SOUND_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0)
diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp
index a4fa7d18304..ef3d9f397d8 100644
--- a/src/devices/bus/interpro/sr/gt.cpp
+++ b/src/devices/bus/interpro/sr/gt.cpp
@@ -57,14 +57,14 @@ DEFINE_DEVICE_TYPE(MPCBA79, mpcba79_device, "mpcba79", "2000 Graphics f/2 1Mp Mo
* be determined to ensure the cursor positions generated by the Bt459 are
* aligned properly on the screen.
*/
-MACHINE_CONFIG_MEMBER(mpcb963_device::device_add_mconfig)
+MACHINE_CONFIG_START(mpcb963_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen0", RASTER)
MCFG_SCREEN_RAW_PARAMS(GT_PIXCLOCK, GT_XPIXELS, 0, GT_XPIXELS, GT_YPIXELS, 0, GT_YPIXELS)
MCFG_SCREEN_UPDATE_DEVICE("", mpcb963_device, screen_update0)
MCFG_DEVICE_ADD("ramdac0", BT459, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER(mpcba79_device::device_add_mconfig)
+MACHINE_CONFIG_START(mpcba79_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen0", RASTER)
MCFG_SCREEN_RAW_PARAMS(GT_PIXCLOCK, GT_XPIXELS, 0, GT_XPIXELS, GT_YPIXELS, 0, GT_YPIXELS)
MCFG_SCREEN_UPDATE_DEVICE("", mpcba79_device, screen_update0)
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index be0de17131b..d85b680de18 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -94,7 +94,7 @@ void intv_ecs_device::late_subslot_setup()
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( intv_ecs_device::device_add_mconfig )
+MACHINE_CONFIG_START(intv_ecs_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono_ecs")
MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2)
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index 96f8a05c451..9494d0986c0 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -69,7 +69,7 @@ void intv_voice_device::late_subslot_setup()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( intv_voice_device::device_add_mconfig )
+MACHINE_CONFIG_START(intv_voice_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono_voice")
MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000)
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
index 3615ea05721..ea3118619f9 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
@@ -143,7 +143,7 @@ static SLOT_INTERFACE_START( intvecs_controller )
SLOT_INTERFACE("handctrl", INTV_HANDCTRL)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( intvecs_ctrls_device::device_add_mconfig )
+MACHINE_CONFIG_START(intvecs_ctrls_device::device_add_mconfig)
MCFG_INTV_CONTROL_PORT_ADD("port1", intvecs_controller, "handctrl")
MCFG_INTV_CONTROL_PORT_ADD("port2", intvecs_controller, "handctrl")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp
index bf9c8db7e6a..32a21069831 100644
--- a/src/devices/bus/iq151/disc2.cpp
+++ b/src/devices/bus/iq151/disc2.cpp
@@ -71,7 +71,7 @@ void iq151_disc2_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( iq151_disc2_device::device_add_mconfig )
+MACHINE_CONFIG_START(iq151_disc2_device::device_add_mconfig)
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats)
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index 1120aeea642..57cb14675f5 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -65,7 +65,7 @@ void iq151_grafik_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( iq151_grafik_device::device_add_mconfig )
+MACHINE_CONFIG_START(iq151_grafik_device::device_add_mconfig)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(iq151_grafik_device, x_write))
MCFG_I8255_OUT_PORTB_CB(WRITE8(iq151_grafik_device, y_write))
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 1dc818dfecf..3375e0c6693 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -60,7 +60,7 @@ void iq151_staper_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( iq151_staper_device::device_add_mconfig )
+MACHINE_CONFIG_START(iq151_staper_device::device_add_mconfig)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(READ8(iq151_staper_device, ppi_porta_r))
MCFG_I8255_OUT_PORTB_CB(WRITE8(iq151_staper_device, ppi_portb_w))
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index 7a811272f38..32151c1675d 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -5,7 +5,7 @@
#define SADDR 0xcc000
-MACHINE_CONFIG_MEMBER(el2_3c503_device::device_add_mconfig)
+MACHINE_CONFIG_START(el2_3c503_device::device_add_mconfig)
MCFG_DEVICE_ADD("dp8390d", DP8390D, 0)
MCFG_DP8390D_IRQ_CB(WRITELINE(el2_3c503_device, el2_3c503_irq_w))
MCFG_DP8390D_MEM_READ_CB(READ8(el2_3c503_device, el2_3c503_mem_read))
diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp
index a82e5d63d7b..52a8e975f7b 100644
--- a/src/devices/bus/isa/adlib.cpp
+++ b/src/devices/bus/isa/adlib.cpp
@@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(ISA8_ADLIB, isa8_adlib_device, "isa_adlib", "Ad Lib Sound Car
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_adlib_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_adlib_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 3.00)
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index b52ab5bb18c..6a536b69f1f 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -273,7 +273,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::aga_update_row )
}
-MACHINE_CONFIG_MEMBER( isa8_aga_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_aga_device::device_add_mconfig)
MCFG_SCREEN_ADD( AGA_SCREEN_NAME, RASTER )
MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz,912,0,640,262,0,200 )
MCFG_SCREEN_UPDATE_DEVICE( AGA_MC6845_NAME, mc6845_device, screen_update )
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index f03d92a105e..9b633c5717a 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -174,7 +174,7 @@ const tiny_rom_entry *aha1542_device::device_rom_region() const
return ROM_NAME( aha1542 );
}
-MACHINE_CONFIG_MEMBER( aha1542_device::device_add_mconfig )
+MACHINE_CONFIG_START(aha1542_device::device_add_mconfig)
MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP( z84c0010_mem )
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 5bac6df381d..0609d9ce7a3 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -261,7 +261,7 @@ DEFINE_DEVICE_TYPE(ISA8_CGA, isa8_cga_device, "cga", "IBM Color/Graphics Monitor
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_cga_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_cga_device::device_add_mconfig)
MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update )
@@ -1701,7 +1701,7 @@ const tiny_rom_entry *isa8_cga_mc1502_device::device_rom_region() const
DEFINE_DEVICE_TYPE(ISA8_CGA_M24, isa8_cga_m24_device, "cga_m24", "Olivetti M24 CGA")
-MACHINE_CONFIG_MEMBER( isa8_cga_m24_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_cga_m24_device::device_add_mconfig)
isa8_cga_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME)
@@ -1896,7 +1896,7 @@ MC6845_UPDATE_ROW( isa8_cga_m24_device::m24_gfx_1bpp_m24_update_row )
DEFINE_DEVICE_TYPE(ISA8_CGA_CPORTIII, isa8_cga_cportiii_device, "cga_cportiii", "Compaq Portable III CGA")
-MACHINE_CONFIG_MEMBER( isa8_cga_cportiii_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_cga_cportiii_device::device_add_mconfig)
isa8_cga_m24_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME)
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index edb477e2ff7..86d0ff8e6ab 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA8_COM, isa8_com_device, "isa_com", "Communications Adapter
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_com_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_com_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL_1_8432MHz )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
@@ -134,7 +134,7 @@ DEFINE_DEVICE_TYPE(ISA8_COM_AT, isa8_com_at_device, "isa_com_at", "Communication
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_com_at_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_com_at_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 4b0811bdbea..38477e648ab 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -153,7 +153,7 @@ const tiny_rom_entry* dectalk_isa_device::device_rom_region() const
return ROM_NAME( dectalk_isa );
}
-MACHINE_CONFIG_MEMBER( dectalk_isa_device::device_add_mconfig )
+MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig)
MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL_20MHz)
MCFG_CPU_IO_MAP(dectalk_cpu_io)
MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map)
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index c700df2ede3..ceb8b9ddc5d 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -528,7 +528,7 @@ DEFINE_DEVICE_TYPE(ISA8_EGA, isa8_ega_device, "ega", "IBM Enhanced Graphics Adap
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_ega_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_ega_device::device_add_mconfig)
MCFG_SCREEN_ADD(EGA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(16257000,912,0,640,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE(EGA_CRTC_NAME, crtc_ega_device, screen_update)
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index ddaf8409a8c..bafe4f953e6 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -80,7 +80,7 @@ isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char
{
}
-MACHINE_CONFIG_MEMBER( isa8_fdc_xt_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_fdc_xt_device::device_add_mconfig)
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w))
MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w))
@@ -93,7 +93,7 @@ isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char
{
}
-MACHINE_CONFIG_MEMBER( isa8_fdc_at_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_fdc_at_device::device_add_mconfig)
MCFG_PC_FDC_AT_ADD("fdc")
MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w))
MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w))
@@ -105,7 +105,7 @@ isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const ch
{
}
-MACHINE_CONFIG_MEMBER( isa8_fdc_smc_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_fdc_smc_device::device_add_mconfig)
MCFG_SMC37C78_ADD("fdc")
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w))
@@ -117,7 +117,7 @@ isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const ch
{
}
-MACHINE_CONFIG_MEMBER( isa8_fdc_ps2_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_fdc_ps2_device::device_add_mconfig)
MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w))
@@ -129,7 +129,7 @@ isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig,
{
}
-MACHINE_CONFIG_MEMBER( isa8_fdc_superio_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_fdc_superio_device::device_add_mconfig)
MCFG_PC_FDC_SUPERIO_ADD("fdc")
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w))
diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp
index 9892e1508a9..0bf818af579 100644
--- a/src/devices/bus/isa/finalchs.cpp
+++ b/src/devices/bus/isa/finalchs.cpp
@@ -70,7 +70,7 @@ DEFINE_DEVICE_TYPE(ISA8_FINALCHS, isa8_finalchs_device, "isa_finalchs", "Final C
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_finalchs_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_finalchs_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu",M65C02,5000000)
MCFG_CPU_PROGRAM_MAP(finalchs_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp
index f742fa413fc..be30269c8e5 100644
--- a/src/devices/bus/isa/gblaster.cpp
+++ b/src/devices/bus/isa/gblaster.cpp
@@ -68,7 +68,7 @@ DEFINE_DEVICE_TYPE(ISA8_GAME_BLASTER, isa8_gblaster_device, "isa_gblaster", "Gam
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_gblaster_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_gblaster_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SAA1099_ADD("saa1099.1", 7159090)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index 5545a070e25..9b8eb08a0b1 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -1250,7 +1250,7 @@ INPUT_PORTS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_gus_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_gus_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MCFG_SOUND_ADD("gf1",GGF1,GF1_CLOCK)
MCFG_SOUND_ROUTE(0,"lspeaker",0.50)
diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp
index d728aa73b74..15b2c66a574 100644
--- a/src/devices/bus/isa/hdc.cpp
+++ b/src/devices/bus/isa/hdc.cpp
@@ -918,7 +918,7 @@ DEFINE_DEVICE_TYPE(ISA8_HDC_EC1841, isa8_hdc_ec1841_device, "isa_hdc_ec1841", "E
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_hdc_device::device_add_mconfig)
MCFG_DEVICE_ADD("hdc",XT_HDC,0)
MCFG_XTHDC_IRQ_HANDLER(WRITELINE(isa8_hdc_device,irq_w))
MCFG_XTHDC_DRQ_HANDLER(WRITELINE(isa8_hdc_device,drq_w))
@@ -926,7 +926,7 @@ MACHINE_CONFIG_MEMBER( isa8_hdc_device::device_add_mconfig )
MCFG_HARDDISK_ADD("hdc:slave")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( isa8_hdc_ec1841_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_hdc_ec1841_device::device_add_mconfig)
MCFG_DEVICE_ADD("hdc",EC1841_HDC,0)
MCFG_XTHDC_IRQ_HANDLER(WRITELINE(isa8_hdc_ec1841_device,irq_w))
MCFG_XTHDC_DRQ_HANDLER(WRITELINE(isa8_hdc_ec1841_device,drq_w))
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index e2c35e02551..a0ac2dd5177 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -372,7 +372,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_ibm_mfc_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig)
MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index a1eee3976cd..140775cde76 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -44,13 +44,12 @@ WRITE_LINE_MEMBER(isa16_ide_device::ide_interrupt)
}
}
-static MACHINE_CONFIG_START(cdrom_headphones)
- MCFG_DEVICE_MODIFY("cdda")
- MCFG_SOUND_ROUTE(0, "lheadphone", 1.0)
- MCFG_SOUND_ROUTE(1, "rheadphone", 1.0)
-
- MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone")
-MACHINE_CONFIG_END
+void isa16_ide_device::cdrom_headphones(device_t *device)
+{
+ device = device->subdevice("cdda");
+ MCFG_SOUND_ROUTE(0, "^^^^lheadphone", 1.0)
+ MCFG_SOUND_ROUTE(1, "^^^^rheadphone", 1.0)
+}
static INPUT_PORTS_START( ide )
PORT_START("DSW")
@@ -69,10 +68,12 @@ DEFINE_DEVICE_TYPE(ISA16_IDE, isa16_ide_device, "isa_ide", "IDE Fixed Drive Adap
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_ide_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_ide_device::device_add_mconfig)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(isa16_ide_device, ide_interrupt))
+ MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone")
+
MCFG_DEVICE_MODIFY("ide:0")
MCFG_SLOT_OPTION_MACHINE_CONFIG("cdrom", cdrom_headphones)
MCFG_DEVICE_MODIFY("ide:1")
diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h
index d1655c5cfd5..36a91c3e96f 100644
--- a/src/devices/bus/isa/ide.h
+++ b/src/devices/bus/isa/ide.h
@@ -27,6 +27,8 @@ public:
READ8_MEMBER(ide16_alt_r);
WRITE8_MEMBER(ide16_alt_w);
+ static void cdrom_headphones(device_t *device);
+
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h
index 74c4a0c9681..5ea44098f8a 100644
--- a/src/devices/bus/isa/isa.h
+++ b/src/devices/bus/isa/isa.h
@@ -81,7 +81,7 @@
#define MCFG_ISA8_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _fixed) \
MCFG_DEVICE_ADD(_tag, ISA8_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \
- isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag);
+ isa8_slot_device::static_set_isa8_slot(*device, this, _isatag);
#define MCFG_ISA16_CPU(_cputag) \
isa8_device::static_set_cputag(*device, _cputag);
#define MCFG_ISA16_BUS_CUSTOM_SPACES() \
@@ -89,7 +89,7 @@
#define MCFG_ISA16_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _fixed) \
MCFG_DEVICE_ADD(_tag, ISA16_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \
- isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag);
+ isa16_slot_device::static_set_isa16_slot(*device, this, _isatag);
#define MCFG_ISA_BUS_IOCHCK(_iochck) \
devcb = &downcast<isa8_device *>(device)->set_iochck_callback(DEVCB_##_iochck);
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index ca81b9a0499..98da3d47ec2 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -19,7 +19,7 @@ isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag,
{
}
-MACHINE_CONFIG_MEMBER( isa8_lpt_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_lpt_device::device_add_mconfig)
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_lpt_device, pc_cpu_line))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp
index 6f94b263c26..8bf78a14505 100644
--- a/src/devices/bus/isa/mach32.cpp
+++ b/src/devices/bus/isa/mach32.cpp
@@ -47,7 +47,7 @@ mach32_device::mach32_device(const machine_config &mconfig, device_type type, co
{
}
-MACHINE_CONFIG_MEMBER( mach32_device::device_add_mconfig )
+MACHINE_CONFIG_START(mach32_device::device_add_mconfig)
MCFG_DEVICE_ADD("8514a", ATIMACH32_8514A, 0)
MCFG_EEPROM_SERIAL_93C56_ADD("ati_eeprom")
MACHINE_CONFIG_END
@@ -266,7 +266,7 @@ mach64_device::mach64_device(const machine_config &mconfig, device_type type, co
{
}
-MACHINE_CONFIG_MEMBER( mach64_device::device_add_mconfig )
+MACHINE_CONFIG_START(mach64_device::device_add_mconfig)
MCFG_DEVICE_ADD("8514a", ATIMACH64_8514A, 0)
MCFG_EEPROM_SERIAL_93C56_ADD("ati_eeprom")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 9ea522fd8f9..6209473b467 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -51,7 +51,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( mc1502_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index a3978eb9369..684c105bd69 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -110,7 +110,7 @@ DEFINE_DEVICE_TYPE(ISA8_MDA, isa8_mda_device, "isa_ibm_mda", "IBM Monochrome Dis
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_mda_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_mda_device::device_add_mconfig)
MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 )
MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
@@ -538,7 +538,7 @@ DEFINE_DEVICE_TYPE(ISA8_HERCULES, isa8_hercules_device, "isa_hercules", "Hercule
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_hercules_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_hercules_device::device_add_mconfig)
MCFG_SCREEN_ADD( HERCULES_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 )
MCFG_SCREEN_UPDATE_DEVICE( HERCULES_MC6845_NAME, mc6845_device, screen_update )
@@ -756,7 +756,7 @@ DEFINE_DEVICE_TYPE(ISA8_EC1840_0002, isa8_ec1840_0002_device, "ec1840_0002", "EC
//-------------------------------------------------
// XXX
-MACHINE_CONFIG_MEMBER( isa8_ec1840_0002_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_ec1840_0002_device::device_add_mconfig)
MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 792, 0, 640, 370, 0, 350 )
MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index 84757bbb6cf..7e71471317d 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -48,7 +48,7 @@ DEFINE_DEVICE_TYPE(ISA8_MPU401, isa8_mpu401_device, "isa_mpu401", "Roland MPU-40
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_mpu401_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_mpu401_device::device_add_mconfig)
MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(isa8_mpu401_device, mpu_irq_out))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index b77c63d51a0..ee8e691c46d 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -44,7 +44,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( mufdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(mufdc_device::device_add_mconfig)
MCFG_MCS3201_ADD("fdc")
MCFG_MCS3201_INPUT_HANDLER(READ8(mufdc_device, fdc_input_r))
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(mufdc_device, fdc_irq_w))
diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp
index 8e368461907..fbbaa39d8c1 100644
--- a/src/devices/bus/isa/myb3k_com.cpp
+++ b/src/devices/bus/isa/myb3k_com.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(ISA8_MYB3K_COM, isa8_myb3k_com_device, "isa8_myb3k_com", "ADP
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_myb3k_com_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig)
MCFG_DEVICE_ADD( "usart", I8251, XTAL_15_9744MHz / 8 )
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index 9d2187a90dd..1e4b478b48d 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -92,7 +92,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
/* */
-MACHINE_CONFIG_MEMBER( isa8_myb3k_fdc4710_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_myb3k_fdc4710_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", MB8876, XTAL_15_9744MHz / 8) /* From StepOne schematics */
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, drq_w))
@@ -101,7 +101,7 @@ MACHINE_CONFIG_MEMBER( isa8_myb3k_fdc4710_device::device_add_mconfig )
MACHINE_CONFIG_END
/* Main difference from fdc4710 is that a Hitachi HA16632AP has replaced the descrete VFO enabling 720Kb disks */
-MACHINE_CONFIG_MEMBER( isa8_myb3k_fdc4711_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_myb3k_fdc4711_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, drq_w))
@@ -112,7 +112,7 @@ MACHINE_CONFIG_MEMBER( isa8_myb3k_fdc4711_device::device_add_mconfig )
MACHINE_CONFIG_END
#if 0
-MACHINE_CONFIG_MEMBER( isa8_myb3k_fdc4712_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_myb3k_fdc4712_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, drq_w))
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index 5041e091a1a..a5359fa189d 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -6,7 +6,7 @@
DEFINE_DEVICE_TYPE(NE1000, ne1000_device, "ne1000", "NE1000 Network Adapter")
-MACHINE_CONFIG_MEMBER(ne1000_device::device_add_mconfig)
+MACHINE_CONFIG_START(ne1000_device::device_add_mconfig)
MCFG_DEVICE_ADD("dp8390d", DP8390D, 0)
MCFG_DP8390D_IRQ_CB(WRITELINE(ne1000_device, ne1000_irq_w))
MCFG_DP8390D_MEM_READ_CB(READ8(ne1000_device, ne1000_mem_read))
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index 19bc8f015de..eceaad0ef24 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -6,7 +6,7 @@
DEFINE_DEVICE_TYPE(NE2000, ne2000_device, "ne2000", "NE2000 Network Adapter")
-MACHINE_CONFIG_MEMBER(ne2000_device::device_add_mconfig)
+MACHINE_CONFIG_START(ne2000_device::device_add_mconfig)
MCFG_DEVICE_ADD("dp8390d", DP8390D, 0)
MCFG_DP8390D_IRQ_CB(WRITELINE(ne2000_device, ne2000_irq_w))
MCFG_DP8390D_MEM_READ_CB(READ8(ne2000_device, ne2000_mem_read))
diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp
index 3cb8078c864..ebdd5b7e4cb 100644
--- a/src/devices/bus/isa/num9rev.cpp
+++ b/src/devices/bus/isa/num9rev.cpp
@@ -52,7 +52,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( isa8_number_9_rev_device::hgdc_display_pixels )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_number_9_rev_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_number_9_rev_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_SIZE(512, 448)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 448-1)
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index 7352f4380a4..fdb4e668580 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( omti_port )
PORT_DIPSETTING( 0x01, "CA000h" )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( omti8621_device::device_add_mconfig )
+MACHINE_CONFIG_START(omti8621_device::device_add_mconfig)
MCFG_DEVICE_ADD(OMTI_DISK0_TAG, OMTI_DISK, 0)
MCFG_DEVICE_ADD(OMTI_DISK1_TAG, OMTI_DISK, 0)
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 53690881366..d9a0e3d86a0 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -61,7 +61,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( p1_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp
index 3656f1846d8..0919718895b 100644
--- a/src/devices/bus/isa/p1_hdc.cpp
+++ b/src/devices/bus/isa/p1_hdc.cpp
@@ -58,7 +58,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( p1_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(p1_hdc_device::device_add_mconfig)
MCFG_DEVICE_ADD(KM1809VG7_TAG, WD2010, 5000000) // XXX clock?
MCFG_WD2010_IN_DRDY_CB(VCC)
MCFG_WD2010_IN_INDEX_CB(VCC)
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index 629926f657a..e9a12df010b 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(P1_SOUND, p1_sound_device, "p1_sound", "Poisk-1 sound card (B
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( p1_sound_device::device_add_mconfig )
+MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("midi", I8251, 0)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(":isa", isa8_device, irq3_w))
diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp
index c86ab0d7c48..bdcecad8ca1 100644
--- a/src/devices/bus/isa/pds.cpp
+++ b/src/devices/bus/isa/pds.cpp
@@ -56,6 +56,6 @@ void isa8_pds_device::device_stop()
{
}
-MACHINE_CONFIG_MEMBER( isa8_pds_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_pds_device::device_add_mconfig)
MCFG_DEVICE_ADD("pds_ppi", I8255, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index c0126190ca7..5caced97de5 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -150,7 +150,7 @@ DEFINE_DEVICE_TYPE(ISA8_PGC, isa8_pgc_device, "isa_ibm_pgc", "IBM Professional G
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_pgc_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/3)
MCFG_CPU_PROGRAM_MAP(pgc_map)
MCFG_CPU_IO_MAP(pgc_io)
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 49853e6c5ba..7f0f2d52b12 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -410,7 +410,7 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const
return ROM_NAME( sb16 );
}
-MACHINE_CONFIG_MEMBER( sb16_lle_device::device_add_mconfig )
+MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig)
MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL_24MHz)
MCFG_CPU_IO_MAP(sb16_io)
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index a6c0bcfa438..c693e4648c9 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -1140,7 +1140,7 @@ DEFINE_DEVICE_TYPE(ISA16_SOUND_BLASTER_16, isa16_sblaster16_device, "isa_sblaste
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_sblaster1_0_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_sblaster1_0_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 3.00)
@@ -1165,7 +1165,7 @@ MACHINE_CONFIG_MEMBER( isa8_sblaster1_0_device::device_add_mconfig )
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( isa8_sblaster1_5_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_sblaster1_5_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
@@ -1185,7 +1185,7 @@ MACHINE_CONFIG_MEMBER( isa8_sblaster1_5_device::device_add_mconfig )
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( isa16_sblaster16_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_sblaster16_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymf262", YMF262, ymf262_StdClock)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp
index d22d0e675c2..e9ace1ddb83 100644
--- a/src/devices/bus/isa/sc499.cpp
+++ b/src/devices/bus/isa/sc499.cpp
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( sc499_port )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( sc499_device::device_add_mconfig )
+MACHINE_CONFIG_START(sc499_device::device_add_mconfig)
MCFG_DEVICE_ADD(SC499_CTAPE_TAG, SC499_CTAPE, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index b576c1881c9..9f13ab1c62a 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(ISA8_SIDE116, side116_device, "side116", "Acculogic sIDE-1/16
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( side116_device::device_add_mconfig )
+MACHINE_CONFIG_START(side116_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(side116_device, ide_interrupt))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index b6983656f9a..4f8568032e4 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -10,7 +10,7 @@
DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001 Audio Adapter")
-MACHINE_CONFIG_MEMBER( ssi2001_device::device_add_mconfig )
+MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("sid6581", MOS6581, XTAL_14_31818MHz/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index da29bbe2eb0..5b9b05033b1 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -114,7 +114,7 @@ const tiny_rom_entry *stereo_fx_device::device_rom_region() const
return ROM_NAME( stereo_fx );
}
-MACHINE_CONFIG_MEMBER( stereo_fx_device::device_add_mconfig )
+MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig)
MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL_30MHz)
MCFG_CPU_IO_MAP(stereo_fx_io)
MCFG_CPU_PROGRAM_MAP(stereo_fx_rom)
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index a946af78b03..a28ef5876e2 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS_GD542X, isa16_svga_cirrus_gd542x_device, "c
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_svga_cirrus_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_svga_cirrus_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update)
@@ -111,7 +111,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_svga_cirrus_gd542x_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_svga_cirrus_gd542x_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index d290dbe6b91..ee5df928b97 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device, "s3_764", "Number Nine 9
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_svga_s3_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_svga_s3_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update)
@@ -147,7 +147,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Gra
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_s3virge_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_s3virge_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update)
@@ -229,7 +229,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device, "s3virgedx", "S3 ViR
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_s3virgedx_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_s3virgedx_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update)
@@ -312,7 +312,7 @@ DEFINE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device, "dms3d2kp", "D
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_stealth3d2kpro_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_stealth3d2kpro_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update)
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index 88223bff1a1..22b307cd6ad 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_TGUI9680, isa16_svga_tgui9680_device, "tgui9680",
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_svga_tgui9680_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_svga_tgui9680_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update)
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index 91a88416c20..8d60d1a2400 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ISA8_SVGA_ET4K, isa8_svga_et4k_device, "et4000", "SVGA Tseng
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_svga_et4k_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa8_svga_et4k_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update)
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index 604d2b13eb7..88c38cd1543 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "vga.h"
#include "video/pc_vga.h"
+#include "screen.h"
ROM_START( ibm_vga )
ROM_REGION(0x8000,"ibm_vga", 0)
@@ -26,8 +27,13 @@ DEFINE_DEVICE_TYPE(ISA8_VGA, isa8_vga_device, "ibm_vga", "IBM VGA Graphics Card"
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa8_vga_device::device_add_mconfig)
- MCFG_FRAGMENT_ADD( pcvideo_vga );
+MACHINE_CONFIG_START(isa8_vga_device::device_add_mconfig)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
+
+ MCFG_PALETTE_ADD("palette", 0x100)
+ MCFG_DEVICE_ADD("vga", VGA, 0)
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 246d091e6bb..25f4202cd89 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -76,7 +76,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_MACH64, isa16_vga_mach64_device, "mach64
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isa16_vga_gfxultra_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_vga_gfxultra_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update)
@@ -86,7 +86,7 @@ MACHINE_CONFIG_MEMBER( isa16_vga_gfxultra_device::device_add_mconfig )
MCFG_DEVICE_ADD("vga", ATI_VGA, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( isa16_vga_gfxultrapro_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_vga_gfxultrapro_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update)
@@ -96,7 +96,7 @@ MACHINE_CONFIG_MEMBER( isa16_vga_gfxultrapro_device::device_add_mconfig )
MCFG_DEVICE_ADD("vga", ATIMACH32, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( isa16_vga_mach64_device::device_add_mconfig )
+MACHINE_CONFIG_START(isa16_vga_mach64_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update)
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index 7930ca4de92..f59d5bf85be 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -138,7 +138,7 @@ WRITE8_MEMBER( wdxt_gen_device::ram_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wdxt_gen_device::device_add_mconfig )
+MACHINE_CONFIG_START(wdxt_gen_device::device_add_mconfig)
MCFG_CPU_ADD(WD1015_TAG, I8049, 5000000)
MCFG_CPU_IO_MAP(wd1015_io)
MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE(WD11C00_17_TAG, wd11c00_17_device, busy_r))
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index a8df13dee9c..6b892add655 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -262,7 +262,7 @@ DEFINE_DEVICE_TYPE(ISA8_XTIDE, xtide_device, "xtide", "XT-IDE Fixed Drive Adapte
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( xtide_device::device_add_mconfig )
+MACHINE_CONFIG_START(xtide_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(xtide_device, ide_interrupt))
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index 327b709dba2..4632038ec87 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -53,7 +53,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( compis_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(compis_fdc_device::device_add_mconfig)
MCFG_I8272A_ADD(I8272_TAG, true)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(compis_fdc_device, fdc_irq))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(compis_fdc_device, fdc_drq))
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index 7b054719a41..868462b505d 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -53,7 +53,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( isbc_218a_device::device_add_mconfig )
+MACHINE_CONFIG_START(isbc_218a_device::device_add_mconfig)
MCFG_I8272A_ADD(I8272_TAG, true)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isbc_218a_device, fdc_irq))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isbc_218a_device, fdc_drq))
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index 9ba57dc6d9d..90b5bf7b3ce 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -108,7 +108,7 @@ void kc_d002_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( kc_d002_device::device_add_mconfig )
+MACHINE_CONFIG_START(kc_d002_device::device_add_mconfig)
MCFG_DEVICE_ADD("m0", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_cart, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT("m4")
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index bbd09065c6f..f2103e0f860 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -146,7 +146,7 @@ void kc_d004_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(kc_d004_device::device_add_mconfig)
+MACHINE_CONFIG_START(kc_d004_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(kc_d004_mem)
MCFG_CPU_IO_MAP(kc_d004_io)
@@ -370,7 +370,7 @@ kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const ch
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(kc_d004_gide_device::device_add_mconfig)
+MACHINE_CONFIG_START(kc_d004_gide_device::device_add_mconfig)
kc_d004_device::device_add_mconfig(config);
MCFG_CPU_MODIFY(Z80_TAG)
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index 6a5a69236ec..861bde164c8 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -25,7 +25,7 @@
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( southbridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(southbridge_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) // heartbeat IRQ
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(southbridge_device, at_pit8254_out0_changed))
@@ -453,7 +453,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(southbridge_extended_device::device_add_mconfig)
+MACHINE_CONFIG_START(southbridge_extended_device::device_add_mconfig)
southbridge_device::device_add_mconfig(config);
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp
index b6ccb6c802a..cce214a6da1 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.cpp
+++ b/src/devices/bus/macpds/pds_tpdfpd.cpp
@@ -58,7 +58,7 @@ DEFINE_DEVICE_TYPE(PDS_SEDISPLAY, macpds_sedisplay_device, "pds_sefp", "Radius S
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( macpds_sedisplay_device::device_add_mconfig )
+MACHINE_CONFIG_START(macpds_sedisplay_device::device_add_mconfig)
MCFG_SCREEN_ADD( SEDISPLAY_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, macpds_sedisplay_device, screen_update)
MCFG_SCREEN_SIZE(1280, 960)
diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp
index 9fca00e8436..a39daf4fb52 100644
--- a/src/devices/bus/megadrive/eeprom.cpp
+++ b/src/devices/bus/megadrive/eeprom.cpp
@@ -107,31 +107,31 @@ md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, co
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( md_std_eeprom_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_std_eeprom_device::device_add_mconfig)
MCFG_24C01_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_nbajam_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_nbajam_device::device_add_mconfig)
MCFG_24C02_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_nbajamte_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_nbajamte_device::device_add_mconfig)
MCFG_24C02_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_cslam_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_cslam_device::device_add_mconfig)
MCFG_24C64_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_nflqb_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_nflqb_device::device_add_mconfig)
MCFG_24C16_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_nhlpa_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_nhlpa_device::device_add_mconfig)
MCFG_24C01_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_eeprom_blara_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_eeprom_blara_device::device_add_mconfig)
MCFG_24C64_ADD("i2cmem")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp
index d9caacd6eea..3bbcba0206c 100644
--- a/src/devices/bus/megadrive/ggenie.cpp
+++ b/src/devices/bus/megadrive/ggenie.cpp
@@ -171,7 +171,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( md_rom_ggenie_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_rom_ggenie_device::device_add_mconfig)
MCFG_MD_CARTRIDGE_ADD("subslot", ggenie_sub_cart, nullptr)
MCFG_MD_CARTRIDGE_NOT_MANDATORY
MACHINE_CONFIG_END
diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp
index 9cad21dc022..aa6d763e517 100644
--- a/src/devices/bus/megadrive/jcart.cpp
+++ b/src/devices/bus/megadrive/jcart.cpp
@@ -76,24 +76,16 @@ md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, cons
// SERIAL I2C DEVICE
//-------------------------------------------------
-// MD_SEPROM_CODEMAST
-
-
-// MD_SEPROM_MM96
-MACHINE_CONFIG_START( md_i2c_24c16a )
- MCFG_24C16A_ADD("i2cmem")
-MACHINE_CONFIG_END
-
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( md_seprom_codemast_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_seprom_codemast_device::device_add_mconfig)
MCFG_24C08_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( md_seprom_mm96_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_seprom_mm96_device::device_add_mconfig)
MCFG_24C16A_ADD("i2cmem")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp
index ddaf4fdcf83..311de07b58e 100644
--- a/src/devices/bus/megadrive/sk.cpp
+++ b/src/devices/bus/megadrive/sk.cpp
@@ -78,7 +78,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( md_rom_sk_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_rom_sk_device::device_add_mconfig)
MCFG_MD_CARTRIDGE_ADD("subslot", sk_sub_cart, nullptr)
MCFG_MD_CARTRIDGE_NOT_MANDATORY
MACHINE_CONFIG_END
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index af18bc02c0d..08a719f4f44 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -345,7 +345,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( md_rom_svp_device::device_add_mconfig )
+MACHINE_CONFIG_START(md_rom_svp_device::device_add_mconfig)
MCFG_CPU_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */
MCFG_CPU_PROGRAM_MAP(md_svp_ssp_map)
MCFG_CPU_IO_MAP(md_svp_ext_map)
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index 748a84f6404..177d33459aa 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -20,7 +20,7 @@ midiin_port_device::midiin_port_device(const machine_config &mconfig, const char
{
}
-MACHINE_CONFIG_MEMBER(midiin_port_device::device_add_mconfig)
+MACHINE_CONFIG_START(midiin_port_device::device_add_mconfig)
MCFG_DEVICE_ADD("midiinimg", MIDIIN, 0)
MCFG_MIDIIN_INPUT_CB(WRITELINE(midiin_port_device, read))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp
index be7df7c0683..449b85b4649 100644
--- a/src/devices/bus/midi/midioutport.cpp
+++ b/src/devices/bus/midi/midioutport.cpp
@@ -20,6 +20,6 @@ midiout_port_device::midiout_port_device(const machine_config &mconfig, const ch
{
}
-MACHINE_CONFIG_MEMBER(midiout_port_device::device_add_mconfig)
+MACHINE_CONFIG_START(midiout_port_device::device_add_mconfig)
MCFG_MIDIOUT_ADD("midioutimg")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index 2d8f9d21cb6..bf1f8cbc977 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -38,7 +38,7 @@ static ADDRESS_MAP_START( bm_012_memory_map, AS_PROGRAM, 8, msx_cart_bm_012_devi
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( msx_cart_bm_012_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig)
// 12MHz XTAL @ X1
// Toshiba TMPZ84C015AF-6 (@U5) components:
// - Z80
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index e5b285fd58a..eddd5d9cfa0 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -194,7 +194,7 @@ void msx_cart_disk_device::initialize_cartridge()
}
-MACHINE_CONFIG_MEMBER( msx_cart_vy0010_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_vy0010_device::device_add_mconfig)
// From VY-0010 schematic:
// HLT pulled high
// SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low
@@ -213,7 +213,7 @@ MACHINE_CONFIG_MEMBER( msx_cart_vy0010_device::device_add_mconfig )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flop_list","msx1_flop")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( msx_cart_fsfd1_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_fsfd1_device::device_add_mconfig)
MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
// Double sided 3.5" floppy drive
@@ -228,7 +228,7 @@ MACHINE_CONFIG_MEMBER( msx_cart_fsfd1_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( msx_cart_fsfd1a_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_fsfd1a_device::device_add_mconfig)
MCFG_TC8566AF_ADD("fdc")
// Double sided 3.5" floppy drive
@@ -243,7 +243,7 @@ MACHINE_CONFIG_MEMBER( msx_cart_fsfd1a_device::device_add_mconfig )
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( msx_cart_fscf351_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_fscf351_device::device_add_mconfig)
MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4)
MCFG_WD_FDC_FORCE_READY
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 3a63c0a8763..788fbb6827e 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -29,7 +29,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons
}
-MACHINE_CONFIG_MEMBER( msx_cart_fmpac_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_fmpac_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index 46633807d9c..57d08bc2c7d 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -141,7 +141,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco
}
-MACHINE_CONFIG_MEMBER( msx_cart_konami_scc_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_konami_scc_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("k051649", K051649, XTAL_10_738635MHz/3/2)
@@ -472,7 +472,7 @@ msx_cart_synthesizer_device::msx_cart_synthesizer_device(const machine_config &m
}
-MACHINE_CONFIG_MEMBER( msx_cart_synthesizer_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_synthesizer_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
@@ -545,7 +545,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config
}
-MACHINE_CONFIG_MEMBER( msx_cart_konami_sound_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_konami_sound_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("k052539", K051649, XTAL_10_738635MHz/3/2)
@@ -871,7 +871,7 @@ static ADDRESS_MAP_START( vlm_map, 0, 8, msx_cart_keyboard_master_device )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( msx_cart_keyboard_master_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_keyboard_master_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL_3_579545MHz)
diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp
index f7f3f301828..77baf81636a 100644
--- a/src/devices/bus/msx_cart/majutsushi.cpp
+++ b/src/devices/bus/msx_cart/majutsushi.cpp
@@ -26,7 +26,7 @@ msx_cart_majutsushi_device::msx_cart_majutsushi_device(const machine_config &mco
}
-MACHINE_CONFIG_MEMBER( msx_cart_majutsushi_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_majutsushi_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC
diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp
index 6debc9e5e84..49db9091ee6 100644
--- a/src/devices/bus/msx_cart/moonsound.cpp
+++ b/src/devices/bus/msx_cart/moonsound.cpp
@@ -35,7 +35,7 @@ static ADDRESS_MAP_START( ymf278b_map, 0, 8, msx_cart_moonsound_device )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( msx_cart_moonsound_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_moonsound_device::device_add_mconfig)
// The moonsound cartridge has a separate stereo output.
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymf278b", YMF278B, YMF278B_STD_CLOCK)
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index fba7b1efc2b..9dcfb09d869 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -80,7 +80,7 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi
}
-MACHINE_CONFIG_MEMBER( msx_cart_msx_audio_hxmu900_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_msx_audio_hxmu900_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) // Not verified
@@ -145,7 +145,7 @@ msx_cart_msx_audio_nms1205_device::msx_cart_msx_audio_nms1205_device(const machi
}
-MACHINE_CONFIG_MEMBER( msx_cart_msx_audio_nms1205_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_msx_audio_nms1205_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
// At the same time the sound is also output on two output on the nms1205 cartridge itself
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -246,7 +246,7 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c
}
-MACHINE_CONFIG_MEMBER( msx_cart_msx_audio_fsca1_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_msx_audio_fsca1_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz)
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index 664d51ab3d2..f0ef8ecc1aa 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -46,7 +46,7 @@ msx_cart_sfg05_device::msx_cart_sfg05_device(const machine_config &mconfig, cons
}
-MACHINE_CONFIG_MEMBER( msx_cart_sfg_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig)
// YM2151 (OPM)
// YM3012 (DAC)
// YM2148 (MKS)
diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp
index 464bb46335c..7223744203f 100644
--- a/src/devices/bus/msx_slot/fs4600.cpp
+++ b/src/devices/bus/msx_slot/fs4600.cpp
@@ -27,7 +27,7 @@ msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, co
}
-MACHINE_CONFIG_MEMBER( msx_slot_fs4600_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_slot_fs4600_device::device_add_mconfig)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp
index 37836ed12ce..d16071a08ec 100644
--- a/src/devices/bus/msx_slot/panasonic08.cpp
+++ b/src/devices/bus/msx_slot/panasonic08.cpp
@@ -33,7 +33,7 @@ msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &m
}
-MACHINE_CONFIG_MEMBER( msx_slot_panasonic08_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_slot_panasonic08_device::device_add_mconfig)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp
index 9eae5f025f4..27ce312bab5 100644
--- a/src/devices/bus/msx_slot/sony08.cpp
+++ b/src/devices/bus/msx_slot/sony08.cpp
@@ -30,7 +30,7 @@ msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, co
}
-MACHINE_CONFIG_MEMBER( msx_slot_sony08_device::device_add_mconfig )
+MACHINE_CONFIG_START(msx_slot_sony08_device::device_add_mconfig)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index cd727d67258..327ab6a5146 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(NASCOM_AVC, nascom_avc_device, "nascom_avc", "Nascom Advanced
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nascom_avc_device::device_add_mconfig )
+MACHINE_CONFIG_START(nascom_avc_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(16250000, 1024, 0, 768, 320, 0, 256)
MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update)
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index 5bcd81b1e6e..a59e51ce422 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -37,7 +37,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nascom_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(nascom_fdc_device::device_add_mconfig)
MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4)
MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h
index c20445c741c..3b553cd66e8 100644
--- a/src/devices/bus/nasbus/nasbus.h
+++ b/src/devices/bus/nasbus/nasbus.h
@@ -111,7 +111,7 @@
#define MCFG_NASBUS_SLOT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, NASBUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- nasbus_slot_device::set_nasbus_slot(*device, owner, NASBUS_TAG);
+ nasbus_slot_device::set_nasbus_slot(*device, this, NASBUS_TAG);
#define MCFG_NASBUS_RAM_DISABLE_HANDLER(_devcb) \
devcb = &nasbus_device::set_ram_disable_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/bus/neogeo/boot_cthd.cpp b/src/devices/bus/neogeo/boot_cthd.cpp
index 796eb14203d..2f6659fddbe 100644
--- a/src/devices/bus/neogeo/boot_cthd.cpp
+++ b/src/devices/bus/neogeo/boot_cthd.cpp
@@ -48,7 +48,7 @@ void neogeo_cthd2k3_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_cthd2k3_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_cthd2k3_cart_device::device_add_mconfig)
MCFG_CTHD_PROT_ADD("cthd_prot")
MACHINE_CONFIG_END
@@ -122,7 +122,7 @@ void neogeo_matrimbl_cart_device::decrypt_all(DECRYPT_ALL_PARAMS)
}
- MACHINE_CONFIG_MEMBER( neogeo_matrimbl_cart_device::device_add_mconfig )
+ MACHINE_CONFIG_START(neogeo_matrimbl_cart_device::device_add_mconfig)
MCFG_KOF2002_PROT_ADD("kof2k2_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_CTHD_PROT_ADD("cthd_prot")
diff --git a/src/devices/bus/neogeo/boot_kof10th.cpp b/src/devices/bus/neogeo/boot_kof10th.cpp
index c79ab457828..1fa9aeb1d84 100644
--- a/src/devices/bus/neogeo/boot_kof10th.cpp
+++ b/src/devices/bus/neogeo/boot_kof10th.cpp
@@ -48,7 +48,7 @@ void neogeo_kof10th_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_kof10th_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kof10th_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/boot_kof2k2.cpp b/src/devices/bus/neogeo/boot_kof2k2.cpp
index bcc6abc1833..611ff47a382 100644
--- a/src/devices/bus/neogeo/boot_kof2k2.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k2.cpp
@@ -12,20 +12,20 @@
#include "boot_kof2k2.h"
-MACHINE_CONFIG_MEMBER( neogeo_kof2002b_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kof2002b_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MCFG_KOF2002_PROT_ADD("kof2k2_prot")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( neogeo_kf2k2mp_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kf2k2mp_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( neogeo_kf2k2mp2_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kf2k2mp2_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
diff --git a/src/devices/bus/neogeo/boot_kof2k3.cpp b/src/devices/bus/neogeo/boot_kof2k3.cpp
index 9a3a5fb3bc4..2c0f4f375a3 100644
--- a/src/devices/bus/neogeo/boot_kof2k3.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k3.cpp
@@ -12,21 +12,21 @@
#include "boot_kof2k3.h"
-MACHINE_CONFIG_MEMBER( neogeo_kf2k3bl_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kf2k3bl_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MCFG_KOF2K3BL_PROT_ADD("kof2k3bl_prot")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( neogeo_kf2k3pl_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kf2k3pl_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MCFG_KOF2K3BL_PROT_ADD("kof2k3bl_prot")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( neogeo_kf2k3upl_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kf2k3upl_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp
index 65e36f87789..f22a0236ebf 100644
--- a/src/devices/bus/neogeo/boot_misc.cpp
+++ b/src/devices/bus/neogeo/boot_misc.cpp
@@ -48,7 +48,7 @@ void neogeo_bootleg_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_bootleg_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_bootleg_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MACHINE_CONFIG_END
@@ -207,7 +207,7 @@ void neogeo_mslug3b6_cart_device::decrypt_all(DECRYPT_ALL_PARAMS)
m_cmc_prot->cmc42_gfx_decrypt(spr_region, spr_region_size, MSLUG3_GFX_KEY);
}
-MACHINE_CONFIG_MEMBER( neogeo_mslug3b6_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_mslug3b6_cart_device::device_add_mconfig)
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MACHINE_CONFIG_END
@@ -234,7 +234,7 @@ void neogeo_ms5plus_cart_device::decrypt_all(DECRYPT_ALL_PARAMS)
m_prot->sx_decrypt(fix_region, fix_region_size, 1);
}
-MACHINE_CONFIG_MEMBER( neogeo_ms5plus_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_ms5plus_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
diff --git a/src/devices/bus/neogeo/boot_svc.cpp b/src/devices/bus/neogeo/boot_svc.cpp
index e63f232d244..dac4a8aedad 100644
--- a/src/devices/bus/neogeo/boot_svc.cpp
+++ b/src/devices/bus/neogeo/boot_svc.cpp
@@ -30,7 +30,7 @@ void neogeo_svcboot_cart_device::decrypt_all(DECRYPT_ALL_PARAMS)
m_prot->svcboot_cx_decrypt(spr_region, spr_region_size);
}
-MACHINE_CONFIG_MEMBER( neogeo_svcboot_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_svcboot_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_PVC_PROT_ADD("pvc_prot")
MACHINE_CONFIG_END
@@ -96,7 +96,7 @@ void neogeo_svcsplus_cart_device::decrypt_all(DECRYPT_ALL_PARAMS)
}
-MACHINE_CONFIG_MEMBER( neogeo_svcsplus_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_svcsplus_cart_device::device_add_mconfig)
MCFG_NEOBOOT_PROT_ADD("bootleg_prot")
MCFG_PVC_PROT_ADD("pvc_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp
index e3262d3527f..841244c478e 100644
--- a/src/devices/bus/neogeo/cmc.cpp
+++ b/src/devices/bus/neogeo/cmc.cpp
@@ -44,7 +44,7 @@ void neogeo_cmc_cart_device::device_reset()
}
-MACHINE_CONFIG_MEMBER( neogeo_cmc_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_cmc_cart_device::device_add_mconfig)
MCFG_CMC_PROT_ADD("cmc_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/fatfury2.cpp b/src/devices/bus/neogeo/fatfury2.cpp
index 092052ec203..b3c9dea575e 100644
--- a/src/devices/bus/neogeo/fatfury2.cpp
+++ b/src/devices/bus/neogeo/fatfury2.cpp
@@ -43,6 +43,6 @@ void neogeo_fatfury2_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_fatfury2_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_fatfury2_cart_device::device_add_mconfig)
MCFG_FATFURY2_PROT_ADD("fatfury2_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/kof2k2.cpp b/src/devices/bus/neogeo/kof2k2.cpp
index 6d93a2ebffc..e313c93034a 100644
--- a/src/devices/bus/neogeo/kof2k2.cpp
+++ b/src/devices/bus/neogeo/kof2k2.cpp
@@ -50,7 +50,7 @@ void neogeo_kof2k2type_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_kof2k2type_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kof2k2type_cart_device::device_add_mconfig)
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MCFG_KOF2002_PROT_ADD("kof2002_prot")
diff --git a/src/devices/bus/neogeo/kof98.cpp b/src/devices/bus/neogeo/kof98.cpp
index f022ea1d748..bc53a930bac 100644
--- a/src/devices/bus/neogeo/kof98.cpp
+++ b/src/devices/bus/neogeo/kof98.cpp
@@ -43,7 +43,7 @@ void neogeo_kof98_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_kof98_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_kof98_cart_device::device_add_mconfig)
MCFG_KOF98_PROT_ADD("kof98_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/mslugx.cpp b/src/devices/bus/neogeo/mslugx.cpp
index 0d5c1807cb0..521f5636a1b 100644
--- a/src/devices/bus/neogeo/mslugx.cpp
+++ b/src/devices/bus/neogeo/mslugx.cpp
@@ -43,6 +43,6 @@ void neogeo_mslugx_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_mslugx_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_mslugx_cart_device::device_add_mconfig)
MCFG_MSLUGX_PROT_ADD("mslugx_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/pcm2.cpp b/src/devices/bus/neogeo/pcm2.cpp
index 024d477a9ec..e098d796229 100644
--- a/src/devices/bus/neogeo/pcm2.cpp
+++ b/src/devices/bus/neogeo/pcm2.cpp
@@ -49,7 +49,7 @@ void neogeo_pcm2_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_pcm2_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_pcm2_cart_device::device_add_mconfig)
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/neogeo/pvc.cpp b/src/devices/bus/neogeo/pvc.cpp
index c4a336e098f..bb9d0098159 100644
--- a/src/devices/bus/neogeo/pvc.cpp
+++ b/src/devices/bus/neogeo/pvc.cpp
@@ -50,7 +50,7 @@ void neogeo_pvc_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_pvc_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_pvc_cart_device::device_add_mconfig)
MCFG_CMC_PROT_ADD("cmc_prot")
MCFG_PCM2_PROT_ADD("pcm2_prot")
MCFG_PVC_PROT_ADD("pvc_prot")
diff --git a/src/devices/bus/neogeo/sma.cpp b/src/devices/bus/neogeo/sma.cpp
index ab1e14d3711..500b88eb7a1 100644
--- a/src/devices/bus/neogeo/sma.cpp
+++ b/src/devices/bus/neogeo/sma.cpp
@@ -54,7 +54,7 @@ void neogeo_sma_cart_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-MACHINE_CONFIG_MEMBER( neogeo_sma_cart_device::device_add_mconfig )
+MACHINE_CONFIG_START(neogeo_sma_cart_device::device_add_mconfig)
MCFG_SMA_PROT_ADD("sma_prot")
MCFG_CMC_PROT_ADD("cmc_prot")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp
index 95aaee375dd..3ebab2fc90b 100644
--- a/src/devices/bus/nes/aladdin.cpp
+++ b/src/devices/bus/nes/aladdin.cpp
@@ -324,6 +324,6 @@ static SLOT_INTERFACE_START(ade_cart)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( nes_aladdin_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_aladdin_device::device_add_mconfig)
MCFG_ALADDIN_MINICART_ADD("ade_slot", ade_cart)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp
index a9d301668ba..22f1655521b 100644
--- a/src/devices/bus/nes/bandai.cpp
+++ b/src/devices/bus/nes/bandai.cpp
@@ -393,11 +393,11 @@ READ8_MEMBER(nes_lz93d50_24c01_device::read_m)
// SERIAL I2C DEVICE
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_lz93d50_24c01_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_lz93d50_24c01_device::device_add_mconfig)
MCFG_24C01_ADD("i2cmem")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_lz93d50_24c02_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_lz93d50_24c02_device::device_add_mconfig)
MCFG_24C02_ADD("i2cmem")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp
index 3efd89e948f..7cb58980960 100644
--- a/src/devices/bus/nes/datach.cpp
+++ b/src/devices/bus/nes/datach.cpp
@@ -202,7 +202,7 @@ uint8_t *nes_datach_rom_device::get_cart_base()
}
-MACHINE_CONFIG_MEMBER( nes_datach_24c01_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_datach_24c01_device::device_add_mconfig)
MCFG_24C01_ADD("i2cmem")
MACHINE_CONFIG_END
@@ -368,7 +368,7 @@ static SLOT_INTERFACE_START(datach_cart)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( nes_datach_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_datach_device::device_add_mconfig)
MCFG_BARCODE_READER_ADD("datach")
MCFG_DATACH_MINICART_ADD("datach_slot", datach_cart)
MCFG_24C02_ADD("i2cmem")
diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp
index dcc4d470aee..1d1643e7e59 100644
--- a/src/devices/bus/nes/disksys.cpp
+++ b/src/devices/bus/nes/disksys.cpp
@@ -52,7 +52,7 @@ static const floppy_interface nes_floppy_interface =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_disksys_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_disksys_device::device_add_mconfig)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp
index 9d15e6dcea6..993fef98387 100644
--- a/src/devices/bus/nes/ggenie.cpp
+++ b/src/devices/bus/nes/ggenie.cpp
@@ -258,7 +258,7 @@ READ8_MEMBER(nes_ggenie_device::nt_r)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_ggenie_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_ggenie_device::device_add_mconfig)
MCFG_NES_CARTRIDGE_ADD("gg_slot", nes_cart, nullptr)
MCFG_NES_CARTRIDGE_NOT_MANDATORY
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp
index fcff0be4483..48c6c0bcaf1 100644
--- a/src/devices/bus/nes/jaleco.cpp
+++ b/src/devices/bus/nes/jaleco.cpp
@@ -772,7 +772,7 @@ static const char *const jf33_sample_names[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_jf13_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf13_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -783,7 +783,7 @@ MACHINE_CONFIG_MEMBER( nes_jf13_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf17_adpcm_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf17_adpcm_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -794,7 +794,7 @@ MACHINE_CONFIG_MEMBER( nes_jf17_adpcm_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf19_adpcm_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf19_adpcm_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -805,7 +805,7 @@ MACHINE_CONFIG_MEMBER( nes_jf19_adpcm_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf23_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf23_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -816,7 +816,7 @@ MACHINE_CONFIG_MEMBER( nes_jf23_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf24_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf24_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -827,7 +827,7 @@ MACHINE_CONFIG_MEMBER( nes_jf24_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf29_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf29_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -838,7 +838,7 @@ MACHINE_CONFIG_MEMBER( nes_jf29_device::device_add_mconfig )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_jf33_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_jf33_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp
index 11165bad0b2..eefd7c5d17d 100644
--- a/src/devices/bus/nes/karastudio.cpp
+++ b/src/devices/bus/nes/karastudio.cpp
@@ -295,6 +295,6 @@ static SLOT_INTERFACE_START(karaoke_studio_cart)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( nes_karaokestudio_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_karaokestudio_device::device_add_mconfig)
MCFG_KSTUDIO_MINICART_ADD("exp_slot", karaoke_studio_cart)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index 58445792bb3..91f7f192f87 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -638,7 +638,7 @@ WRITE8_MEMBER(nes_konami_vrc6_device::write_h)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_konami_vrc6_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_konami_vrc6_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
@@ -762,7 +762,7 @@ WRITE8_MEMBER(nes_konami_vrc7_device::write_h)
// FIXME: we currently emulate this as a base YM2413!
-MACHINE_CONFIG_MEMBER( nes_konami_vrc7_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_konami_vrc7_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp
index f17b6f5e93a..e19bb393a77 100644
--- a/src/devices/bus/nes/pt554.cpp
+++ b/src/devices/bus/nes/pt554.cpp
@@ -88,7 +88,7 @@ static const char *const pt554_sample_names[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_bandai_pt554_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_bandai_pt554_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index 4324d2f0581..8b527d1ec43 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -610,7 +610,7 @@ WRITE8_MEMBER(nes_sunsoft_5_device::write_h)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_sunsoft_5_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_sunsoft_5_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp
index 49a12e88a60..5f2643865dd 100644
--- a/src/devices/bus/nes/sunsoft_dcs.cpp
+++ b/src/devices/bus/nes/sunsoft_dcs.cpp
@@ -284,7 +284,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_sunsoft_dcs_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_sunsoft_dcs_device::device_add_mconfig)
MCFG_NTB_MINICART_ADD("ntb_slot", ntb_cart)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp
index 263017e27a3..404b0fef12e 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/nes_ctrl/bcbattle.cpp
@@ -20,7 +20,7 @@
DEFINE_DEVICE_TYPE(NES_BARCODE_BATTLER, nes_bcbattle_device, "nes_bcbattle", "Epoch Barcode Battler (FC)")
-MACHINE_CONFIG_MEMBER( nes_bcbattle_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_bcbattle_device::device_add_mconfig)
MCFG_BARCODE_READER_ADD("battler")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index 6442f6d2709..5b59ebb5f33 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -90,7 +90,7 @@ DECLARE_DEVICE_TYPE(NES_CONTROL_PORT, nes_control_port_device)
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
#define MCFG_NESCTRL_BRIGHTPIXEL_CB(_class, _method) \
- nes_control_port_device::set_brightpixel_callback(*device, nesctrl_brightpixel_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ nes_control_port_device::set_brightpixel_callback(*device, nesctrl_brightpixel_delegate(&_class::_method, #_class "::" #_method, this));
SLOT_INTERFACE_EXTERN( nes_control_port1_devices );
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp
index 18ea47ecb66..9c81fbea67e 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.cpp
+++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp
@@ -123,7 +123,7 @@ ioport_constructor nes_fckeybrd_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_fckeybrd_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_fckeybrd_device::device_add_mconfig)
MCFG_CASSETTE_ADD("tape")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("fc_cass")
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index 14e6cb227c8..9710c33deeb 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -58,12 +58,12 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_horitwin_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_horitwin_device::device_add_mconfig)
MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad")
MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( nes_hori4p_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_hori4p_device::device_add_mconfig)
MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad")
MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad")
MCFG_FC_EXPANSION_PORT_ADD("port3", hori_adapter, "joypad")
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index 33743f41936..96a22ac1f66 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -153,7 +153,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nes_arcstick_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_arcstick_device::device_add_mconfig)
// expansion port to allow daisy chaining
MCFG_FC_EXPANSION_PORT_ADD("subexp", arcstick_daisy, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 350286db17a..576ce755083 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -22,7 +22,7 @@
DEFINE_DEVICE_TYPE(NES_MIRACLE, nes_miracle_device, "nes_miracle", "NES Miracle Piano Controller")
-MACHINE_CONFIG_MEMBER( nes_miracle_device::device_add_mconfig )
+MACHINE_CONFIG_START(nes_miracle_device::device_add_mconfig)
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(nes_miracle_device, rx_w))
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index 651fedc5407..f07e29b245e 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( newbrain_eim_device::device_add_mconfig )
+MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig)
// devices
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/8)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc))
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index 1d52b2842de..52ee62e262a 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -101,7 +101,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( newbrain_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem)
MCFG_CPU_IO_MAP(newbrain_fdc_io)
diff --git a/src/devices/bus/nubus/bootbug.cpp b/src/devices/bus/nubus/bootbug.cpp
index 80e88e06a23..5a8db4cec39 100644
--- a/src/devices/bus/nubus/bootbug.cpp
+++ b/src/devices/bus/nubus/bootbug.cpp
@@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(NUBUS_BOOTBUG, nubus_bootbug_device, "nb_btbug", "Brigent Boo
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_bootbug_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_bootbug_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp
index 8e1bd9306fd..dcab3a6b1bb 100644
--- a/src/devices/bus/nubus/nubus_48gc.cpp
+++ b/src/devices/bus/nubus/nubus_48gc.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(NUBUS_824GC, nubus_824gc_device, "nb_824gc", "Apple 8*24 vide
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( jmfb_device::device_add_mconfig )
+MACHINE_CONFIG_START(jmfb_device::device_add_mconfig)
MCFG_SCREEN_ADD( GC48_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, jmfb_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index b7a99b60888..733c0d41416 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(NUBUS_APPLEENET, nubus_appleenet_device, "nb_aenet", "Apple N
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_mac8390_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_mac8390_device::device_add_mconfig)
MCFG_DEVICE_ADD(MAC8390_839X, DP8390D, 0)
MCFG_DP8390D_IRQ_CB(WRITELINE(nubus_mac8390_device, dp_irq_w))
MCFG_DP8390D_MEM_READ_CB(READ8(nubus_mac8390_device, dp_mem_read))
diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp
index cdc5e0f13eb..1ea07a83838 100644
--- a/src/devices/bus/nubus/nubus_cb264.cpp
+++ b/src/devices/bus/nubus/nubus_cb264.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(NUBUS_CB264, nubus_cb264_device, "nb_c264", "RasterOps ColorB
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_cb264_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_cb264_device::device_add_mconfig)
MCFG_SCREEN_ADD( CB264_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_cb264_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp
index 88df6f108fd..56b2ff3ff0c 100644
--- a/src/devices/bus/nubus/nubus_image.cpp
+++ b/src/devices/bus/nubus/nubus_image.cpp
@@ -130,7 +130,7 @@ DEFINE_DEVICE_TYPE(NUBUS_IMAGE, nubus_image_device, "nb_image", "NuBus Disk Imag
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_image_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_image_device::device_add_mconfig)
MCFG_DEVICE_ADD(IMAGE_DISK0_TAG, MESSIMG_DISK, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp
index da2964b0b45..6a76bd29ff8 100644
--- a/src/devices/bus/nubus/nubus_m2hires.cpp
+++ b/src/devices/bus/nubus/nubus_m2hires.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(NUBUS_M2HIRES, nubus_m2hires_device, "nb_m2hr", "Macintosh II
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_m2hires_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_m2hires_device::device_add_mconfig)
MCFG_SCREEN_ADD( M2HIRES_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_m2hires_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp
index 38d86ef808a..9e998216078 100644
--- a/src/devices/bus/nubus/nubus_m2video.cpp
+++ b/src/devices/bus/nubus/nubus_m2video.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(NUBUS_M2VIDEO, nubus_m2video_device, "nb_m2vc", "Macintosh II
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_m2video_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_m2video_device::device_add_mconfig)
MCFG_SCREEN_ADD(M2VIDEO_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_m2video_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp
index dcf0ac1e660..3fe40215d09 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.cpp
+++ b/src/devices/bus/nubus/nubus_radiustpd.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(NUBUS_RADIUSTPD, nubus_radiustpd_device, "nb_rtpd", "Radius T
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_radiustpd_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_radiustpd_device::device_add_mconfig)
MCFG_SCREEN_ADD( RADIUSTPD_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_radiustpd_device, screen_update)
MCFG_SCREEN_SIZE(1280, 960)
diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp
index 6217e4d8abc..be1150eab1b 100644
--- a/src/devices/bus/nubus/nubus_spec8.cpp
+++ b/src/devices/bus/nubus/nubus_spec8.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(NUBUS_SPEC8S3, nubus_spec8s3_device, "nb_sp8s3", "SuperMac Sp
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_spec8s3_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_spec8s3_device::device_add_mconfig)
MCFG_SCREEN_ADD( SPEC8S3_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_spec8s3_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp
index bf4c231e5c3..05affbbad91 100644
--- a/src/devices/bus/nubus/nubus_specpdq.cpp
+++ b/src/devices/bus/nubus/nubus_specpdq.cpp
@@ -51,7 +51,7 @@ DEFINE_DEVICE_TYPE(NUBUS_SPECPDQ, nubus_specpdq_device, "nb_spdq", "SuperMac Spe
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_specpdq_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_specpdq_device::device_add_mconfig)
MCFG_SCREEN_ADD( SPECPDQ_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_specpdq_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp
index fd9f38157ed..7e59cf1fa06 100644
--- a/src/devices/bus/nubus/nubus_vikbw.cpp
+++ b/src/devices/bus/nubus/nubus_vikbw.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(NUBUS_VIKBW, nubus_vikbw_device, "nb_vikbw", "Moniterm Viking
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_vikbw_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_vikbw_device::device_add_mconfig)
MCFG_SCREEN_ADD( VIKBW_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_vikbw_device, screen_update)
MCFG_SCREEN_SIZE(1024,768)
diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp
index 22b055e8336..58d906c3fbf 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.cpp
+++ b/src/devices/bus/nubus/nubus_wsportrait.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(NUBUS_WSPORTRAIT, nubus_wsportrait_device, "nb_wspt", "Macint
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_wsportrait_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_wsportrait_device::device_add_mconfig)
MCFG_SCREEN_ADD( WSPORTRAIT_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_wsportrait_device, screen_update)
MCFG_SCREEN_SIZE(1024,960)
diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp
index 0a351e5138b..f8b65e11452 100644
--- a/src/devices/bus/nubus/pds30_30hr.cpp
+++ b/src/devices/bus/nubus/pds30_30hr.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(PDS030_XCEED30HR, nubus_xceed30hr_device, "pd3_30hr", "Micron
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_xceed30hr_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_xceed30hr_device::device_add_mconfig)
MCFG_SCREEN_ADD( XCEED30HR_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_xceed30hr_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp
index 1e730ddb5c3..0af9b486247 100644
--- a/src/devices/bus/nubus/pds30_cb264.cpp
+++ b/src/devices/bus/nubus/pds30_cb264.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(PDS030_CB264SE30, nubus_cb264se30_device, "pd3_c264", "Raster
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_cb264se30_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_cb264se30_device::device_add_mconfig)
MCFG_SCREEN_ADD( CB264SE30_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_cb264se30_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp
index c66f219b13f..9a04b9aeb60 100644
--- a/src/devices/bus/nubus/pds30_mc30.cpp
+++ b/src/devices/bus/nubus/pds30_mc30.cpp
@@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(PDS030_XCEEDMC30, nubus_xceedmc30_device, "pd3_mclr", "Micron
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_xceedmc30_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_xceedmc30_device::device_add_mconfig)
MCFG_SCREEN_ADD( XCEEDMC30_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_xceedmc30_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp
index 80691948af5..f0c8560bd51 100644
--- a/src/devices/bus/nubus/pds30_procolor816.cpp
+++ b/src/devices/bus/nubus/pds30_procolor816.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(PDS030_PROCOLOR816, nubus_procolor816_device, "pd3_pc16", "La
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_procolor816_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_procolor816_device::device_add_mconfig)
MCFG_SCREEN_ADD( PROCOLOR816_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_procolor816_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp
index 5917d0f13b0..38abae63158 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.cpp
+++ b/src/devices/bus/nubus/pds30_sigmalview.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(PDS030_LVIEW, nubus_lview_device, "pd3_lviw", "Sigma Designs
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_lview_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_lview_device::device_add_mconfig)
MCFG_SCREEN_ADD( LVIEW_SCREEN_NAME, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_lview_device, screen_update)
MCFG_SCREEN_SIZE(832,600)
diff --git a/src/devices/bus/nubus/quadralink.cpp b/src/devices/bus/nubus/quadralink.cpp
index bd6541bc9a5..3fca63470bc 100644
--- a/src/devices/bus/nubus/quadralink.cpp
+++ b/src/devices/bus/nubus/quadralink.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(NUBUS_QUADRALINK, nubus_quadralink_device, "nb_qdlink", "Appl
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( nubus_quadralink_device::device_add_mconfig )
+MACHINE_CONFIG_START(nubus_quadralink_device::device_add_mconfig)
MCFG_SCC8530_ADD("scc1", XTAL_3_6864MHz, 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index b58abad2d31..fd44863bae3 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -43,7 +43,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( o2_chess_device::device_add_mconfig )
+MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig)
MCFG_CPU_ADD("subcpu", NSC800, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(chess_mem)
MCFG_CPU_IO_MAP(chess_io)
diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp
index 79e82a20fe5..95ea242e7c1 100644
--- a/src/devices/bus/odyssey2/voice.cpp
+++ b/src/devices/bus/odyssey2/voice.cpp
@@ -43,7 +43,7 @@ void o2_voice_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( o2_voice_device::device_add_mconfig )
+MACHINE_CONFIG_START(o2_voice_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000)
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index 23b79cf4290..400311da867 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -70,7 +70,7 @@ const tiny_rom_entry *jasmin_device::device_rom_region() const
return ROM_NAME( jasmin );
}
-MACHINE_CONFIG_MEMBER( jasmin_device::device_add_mconfig )
+MACHINE_CONFIG_START(jasmin_device::device_add_mconfig)
MCFG_WD1770_ADD("fdc", XTAL_8MHz)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w))
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index e42172521b9..7d151fa1b54 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -66,7 +66,7 @@ const tiny_rom_entry *microdisc_device::device_rom_region() const
return ROM_NAME( microdisc );
}
-MACHINE_CONFIG_MEMBER( microdisc_device::device_add_mconfig )
+MACHINE_CONFIG_START(microdisc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL_8MHz/8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w))
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 8b4ee8f57cf..dfbc2aaed62 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -66,7 +66,7 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ec_1841_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ec_1841_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_46MHz)
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ec_1841_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(ec_1841_keyboard_device, p1_r))
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index db2a99a79b8..4908db4baef 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -70,7 +70,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( iskr_1030_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(iskr_1030_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5MHz)
MCFG_CPU_IO_MAP(iskr_1030_keyboard_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r))
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 0d01789f493..c5f99b37020 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -422,7 +422,7 @@ void pc_kbd_keytronic_pc3270_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc_kbd_keytronic_pc3270_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc_kbd_keytronic_pc3270_device::device_add_mconfig)
MCFG_CPU_ADD("kb_keytr", I8051, 11060250)
MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program)
MCFG_CPU_IO_MAP(keytronic_pc3270_io)
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index 4383081e034..5cf275fbe33 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -257,7 +257,7 @@ void pc_kbd_microsoft_natural_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc_kbd_microsoft_natural_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc_kbd_microsoft_natural_device::device_add_mconfig)
MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz)
MCFG_CPU_IO_MAP(microsoft_natural_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index 60b8151b135..1eb25cb0b17 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *ibm_pc_83_keyboard_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ibm_pc_83_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ibm_pc_83_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20)))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_83_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_83_keyboard_device, p1_r))
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h
index 5b72ef6cd64..f6de3d3a86e 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.h
+++ b/src/devices/bus/pc_kbd/pc_kbdc.h
@@ -29,7 +29,7 @@ set the data line and then set the clock line.
#define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) );
+ pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, subdevice(_kbdc_tag) );
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index 8a079ad61a5..605b862622a 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -103,7 +103,7 @@ const tiny_rom_entry *ibm_3270pc_122_keyboard_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ibm_pc_at_84_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ibm_pc_at_84_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, 5364000)
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_at_84_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_at_84_keyboard_device, p1_r))
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index 0255dfec141..5eff0f2e55d 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -72,7 +72,7 @@ const tiny_rom_entry *ibm_pc_xt_83_keyboard_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ibm_pc_xt_83_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ibm_pc_xt_83_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20.7)))
MCFG_MCS48_PORT_BUS_IN_CB(READ8(ibm_pc_xt_83_keyboard_device, bus_r))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_xt_83_keyboard_device, bus_w))
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index 62df82f5079..8234878e025 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -93,7 +93,7 @@ ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pet_userport_joystick_and_sound_device::device_add_mconfig )
+MACHINE_CONFIG_START(pet_userport_joystick_and_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index 990d17d0c9c..1212f46c3ca 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(C1531, c1531_device, "c1531", "Commodore 1531 Datassette")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c2n_device::device_add_mconfig )
+MACHINE_CONFIG_START(c2n_device::device_add_mconfig)
MCFG_CASSETTE_ADD("cassette" )
MCFG_CASSETTE_FORMATS(cbm_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index 8a4fbe3ef76..a81bef5dbef 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device,
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pet_userport_cb2_sound_device::device_add_mconfig )
+MACHINE_CONFIG_START(pet_userport_cb2_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index a12e9adec0c..48b928dd334 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -89,7 +89,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cbm8000_hsg_a_device::device_add_mconfig )
+MACHINE_CONFIG_START(cbm8000_hsg_a_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 512)
@@ -105,7 +105,7 @@ MACHINE_CONFIG_MEMBER( cbm8000_hsg_a_device::device_add_mconfig )
MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_512x512);
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( cbm8000_hsg_b_device::device_add_mconfig )
+MACHINE_CONFIG_START(cbm8000_hsg_b_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 256)
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index e03d2081103..6857de7add9 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( superpet_device::device_add_mconfig )
+MACHINE_CONFIG_START(superpet_device::device_add_mconfig)
MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16)
MCFG_CPU_PROGRAM_MAP(superpet_mem)
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 5bc0e6b3d2c..424902d9cef 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -343,7 +343,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( c1551_device::device_add_mconfig )
+MACHINE_CONFIG_START(c1551_device::device_add_mconfig)
MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8)
MCFG_CPU_PROGRAM_MAP(c1551_mem)
MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w))
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index a75b889ffcf..d0977f62951 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -64,7 +64,7 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( plus4_sid_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index 8334f99b2d2..42a207c7f89 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC101, pofo_hpc101_device, "pofo_hpc101", "Atari Portfo
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pofo_hpc101_device::device_add_mconfig )
+MACHINE_CONFIG_START(pofo_hpc101_device::device_add_mconfig)
MCFG_DEVICE_ADD(M82C55A_TAG, I8255A, 0)
MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_ctrl_out", output_latch_device, write))
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index ff25d47d7a9..a81c38bd837 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pofo_hpc102_device::device_add_mconfig )
+MACHINE_CONFIG_START(pofo_hpc102_device::device_add_mconfig)
MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL_1_8432MHz) // should be INS8250A
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 0f4db13da9c..0a675077059 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC104_2, pofo_hpc104_2_device, "pofo_hpc104_2", "Atari
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pofo_hpc104_device::device_add_mconfig )
+MACHINE_CONFIG_START(pofo_hpc104_device::device_add_mconfig)
MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_B_TAG, portfolio_memory_cards, nullptr)
MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr)
diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp
index 127c7412fb9..35bd6d74230 100644
--- a/src/devices/bus/psi_kbd/ergoline.cpp
+++ b/src/devices/bus/psi_kbd/ergoline.cpp
@@ -56,7 +56,7 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const
return ROM_NAME(kbd_pcb);
}
-MACHINE_CONFIG_MEMBER( ergoline_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", I8031, XTAL_5_5296MHz)
MCFG_CPU_PROGRAM_MAP(kbd_mem)
MCFG_CPU_IO_MAP(kbd_io)
diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index f41debd632c..328c338c45f 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -25,7 +25,7 @@ void psx_controller_port_device::device_config_complete()
m_dev = dynamic_cast<device_psx_controller_interface *>(get_card_device());
}
-MACHINE_CONFIG_MEMBER( psx_controller_port_device::device_add_mconfig )
+MACHINE_CONFIG_START(psx_controller_port_device::device_add_mconfig)
MCFG_PSXCARD_ADD("card")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp
index 1a432b646a6..9d539821707 100644
--- a/src/devices/bus/psx/multitap.cpp
+++ b/src/devices/bus/psx/multitap.cpp
@@ -21,7 +21,7 @@ psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const ch
{
}
-MACHINE_CONFIG_MEMBER( psx_multitap_device::device_add_mconfig )
+MACHINE_CONFIG_START(psx_multitap_device::device_add_mconfig)
MCFG_PSX_CTRL_PORT_ADD("a", psx_controllers_nomulti, "digital_pad")
MCFG_PSX_CTRL_PORT_ADD("b", psx_controllers_nomulti, nullptr)
MCFG_PSX_CTRL_PORT_ADD("c", psx_controllers_nomulti, nullptr)
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index 88fb8fdf3c7..f34b504ac51 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *cst_q_plus4_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cst_q_plus4_device::device_add_mconfig )
+MACHINE_CONFIG_START(cst_q_plus4_device::device_add_mconfig)
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
MCFG_QL_EXPANSION_SLOT_ADD("exp1", ql_expansion_cards, nullptr)
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index 3e8dbf70718..ed89421af3d 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -92,7 +92,7 @@ const tiny_rom_entry *qubide_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( qubide_device::device_add_mconfig )
+MACHINE_CONFIG_START(qubide_device::device_add_mconfig)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index 3c365d16619..5419a4f22a1 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -81,7 +81,7 @@ WRITE_LINE_MEMBER( sandy_super_disk_device::busy_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sandy_super_disk_device::device_add_mconfig )
+MACHINE_CONFIG_START(sandy_super_disk_device::device_add_mconfig)
MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, nullptr, sandy_super_disk_device::floppy_formats)
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index 09d8677dc06..c15c1d656ba 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -102,7 +102,7 @@ WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sandy_superqboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(sandy_superqboard_device::device_add_mconfig)
MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats)
diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp
index f91842e1d61..e1079b1826b 100644
--- a/src/devices/bus/ql/trumpcard.cpp
+++ b/src/devices/bus/ql/trumpcard.cpp
@@ -85,7 +85,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ql_trump_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(ql_trump_card_device::device_add_mconfig)
MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", ql_trump_card_floppies, "35dd", ql_trump_card_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", ql_trump_card_floppies, nullptr, ql_trump_card_device::floppy_formats)
diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp
index 1f4ba8d5ae9..def7bd2a315 100644
--- a/src/devices/bus/rs232/null_modem.cpp
+++ b/src/devices/bus/rs232/null_modem.cpp
@@ -22,7 +22,7 @@ null_modem_device::null_modem_device(const machine_config &mconfig, const char *
{
}
-MACHINE_CONFIG_MEMBER(null_modem_device::device_add_mconfig)
+MACHINE_CONFIG_START(null_modem_device::device_add_mconfig)
MCFG_DEVICE_ADD("stream", BITBANGER, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index 82dc2530f5b..67974677054 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -16,7 +16,7 @@ serial_printer_device::serial_printer_device(const machine_config &mconfig, cons
{
}
-MACHINE_CONFIG_MEMBER(serial_printer_device::device_add_mconfig)
+MACHINE_CONFIG_START(serial_printer_device::device_add_mconfig)
MCFG_DEVICE_ADD("printer", PRINTER, 0)
MCFG_PRINTER_ONLINE_CB(WRITELINE(serial_printer_device, printer_online))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp
index b38ce25f400..59083fda039 100644
--- a/src/devices/bus/rs232/sun_kbd.cpp
+++ b/src/devices/bus/rs232/sun_kbd.cpp
@@ -22,7 +22,7 @@ sun_keyboard_adaptor_device::~sun_keyboard_adaptor_device()
}
-MACHINE_CONFIG_MEMBER(sun_keyboard_adaptor_device::device_add_mconfig)
+MACHINE_CONFIG_START(sun_keyboard_adaptor_device::device_add_mconfig)
MCFG_SUNKBD_PORT_ADD("keyboard", default_sun_keyboard_devices, nullptr)
MCFG_SUNKBD_RXD_HANDLER(WRITELINE(sun_keyboard_adaptor_device, output_rxd))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp
index f9c7e0f7cbe..ef9ca09c258 100644
--- a/src/devices/bus/rs232/xvd701.cpp
+++ b/src/devices/bus/rs232/xvd701.cpp
@@ -12,7 +12,7 @@ jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *
{
}
-MACHINE_CONFIG_MEMBER(jvc_xvd701_device::device_add_mconfig)
+MACHINE_CONFIG_START(jvc_xvd701_device::device_add_mconfig)
MACHINE_CONFIG_END
static INPUT_PORTS_START(xvd701)
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index 83c7905f15e..e34be7e4163 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -101,7 +101,7 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s100_dj2db_device::device_add_mconfig )
+MACHINE_CONFIG_START(s100_dj2db_device::device_add_mconfig)
MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz)
MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w))
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index ebe43123e60..68949a5b7aa 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -76,7 +76,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s100_djdma_device::device_add_mconfig )
+MACHINE_CONFIG_START(s100_djdma_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(djdma_mem)
MCFG_CPU_IO_MAP(djdma_io)
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp
index e413d065560..a54bbc0c1a1 100644
--- a/src/devices/bus/s100/nsmdsa.cpp
+++ b/src/devices/bus/s100/nsmdsa.cpp
@@ -56,7 +56,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s100_mds_a_device::device_add_mconfig )
+MACHINE_CONFIG_START(s100_mds_a_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp
index 34671f9f1a5..80c75dd935f 100644
--- a/src/devices/bus/s100/nsmdsad.cpp
+++ b/src/devices/bus/s100/nsmdsad.cpp
@@ -57,7 +57,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s100_mds_ad_device::device_add_mconfig )
+MACHINE_CONFIG_START(s100_mds_ad_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index 1bd7df7cb2a..a550be2adef 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -87,7 +87,7 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s100_wunderbus_device::device_add_mconfig )
+MACHINE_CONFIG_START(s100_wunderbus_device::device_add_mconfig)
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(WRITELINE(s100_wunderbus_device, pic_int_w))
MCFG_PIC8259_IN_SP_CB(VCC)
diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp
index a4f7112cc27..393fbc01b32 100644
--- a/src/devices/bus/sat_ctrl/multitap.cpp
+++ b/src/devices/bus/sat_ctrl/multitap.cpp
@@ -124,7 +124,7 @@ uint8_t saturn_multitap_device::read_id(int idx)
}
-MACHINE_CONFIG_MEMBER( saturn_multitap_device::device_add_mconfig )
+MACHINE_CONFIG_START(saturn_multitap_device::device_add_mconfig)
MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad")
MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad")
MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad")
diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp
index 17f30323d71..4aa22d37584 100644
--- a/src/devices/bus/sat_ctrl/segatap.cpp
+++ b/src/devices/bus/sat_ctrl/segatap.cpp
@@ -108,7 +108,7 @@ uint8_t saturn_segatap_device::read_id(int idx)
}
-MACHINE_CONFIG_MEMBER( saturn_segatap_device::device_add_mconfig )
+MACHINE_CONFIG_START(saturn_segatap_device::device_add_mconfig)
MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad")
MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad")
MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad")
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index ff415334240..415b68bb4ed 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -176,7 +176,7 @@ void omti5100_device::WriteData( uint8_t *data, int dataLength )
}
}
-MACHINE_CONFIG_MEMBER( omti5100_device::device_add_mconfig )
+MACHINE_CONFIG_START(omti5100_device::device_add_mconfig)
MCFG_HARDDISK_ADD("image0")
MCFG_HARDDISK_ADD("image1")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index 6ac251ca6e2..c61046950f7 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -163,7 +163,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( s1410_device::device_add_mconfig )
+MACHINE_CONFIG_START(s1410_device::device_add_mconfig)
MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(s1410_mem)
MCFG_CPU_IO_MAP(s1410_io)
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 86063c2dbfb..b38717b3f5b 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -57,7 +57,7 @@ const tiny_rom_entry *sa1403d_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sa1403d_device::device_add_mconfig )
+MACHINE_CONFIG_START(sa1403d_device::device_add_mconfig)
MCFG_HARDDISK_ADD("image")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 536023b59e9..1642ad51408 100644
--- a/src/devices/bus/scsi/scsi.cpp
+++ b/src/devices/bus/scsi/scsi.cpp
@@ -61,7 +61,7 @@ scsi_port_device::scsi_port_device(const machine_config &mconfig, const char *ta
{
}
-MACHINE_CONFIG_MEMBER( scsi_port_device::device_add_mconfig )
+MACHINE_CONFIG_START(scsi_port_device::device_add_mconfig)
MCFG_DEVICE_ADD( SCSI_PORT_DEVICE1, SCSI_PORT_SLOT, 0 )
MCFG_DEVICE_ADD( SCSI_PORT_DEVICE2, SCSI_PORT_SLOT, 0 )
MCFG_DEVICE_ADD( SCSI_PORT_DEVICE3, SCSI_PORT_SLOT, 0 )
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index ede38369d8b..42da6f2fc6c 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -30,7 +30,7 @@ void scsicd_device::device_start()
scsihle_device::device_start();
}
-MACHINE_CONFIG_MEMBER(scsicd_device::device_add_mconfig)
+MACHINE_CONFIG_START(scsicd_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_SOUND_ADD("cdda", CDDA, 0)
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index 78157394a4d..b63bafeb098 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -29,7 +29,7 @@ void scsihd_device::device_start()
scsihle_device::device_start();
}
-MACHINE_CONFIG_MEMBER(scsihd_device::device_add_mconfig)
+MACHINE_CONFIG_START(scsihd_device::device_add_mconfig)
MCFG_HARDDISK_ADD("image")
MCFG_HARDDISK_INTERFACE("scsi_hdd")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp
index a46fef8b268..f5b82e5f2b3 100644
--- a/src/devices/bus/sega8/ccatch.cpp
+++ b/src/devices/bus/sega8/ccatch.cpp
@@ -52,6 +52,6 @@ static SLOT_INTERFACE_START(sg1000_card)
SLOT_INTERFACE_INTERNAL("rom", SEGA8_ROM_STD)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( sega8_cardcatch_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega8_cardcatch_device::device_add_mconfig)
MCFG_SG1000_CARD_ADD("cardslot", sg1000_card, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp
index 76e80f8c433..977ea1f18e7 100644
--- a/src/devices/bus/sega8/mgear.cpp
+++ b/src/devices/bus/sega8/mgear.cpp
@@ -38,7 +38,7 @@ void sega8_mgear_device::device_reset()
}
-MACHINE_CONFIG_MEMBER( sega8_mgear_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega8_mgear_device::device_add_mconfig)
MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","sms")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp
index e3fa290489c..dbd91192d00 100644
--- a/src/devices/bus/sega8/rom.cpp
+++ b/src/devices/bus/sega8/rom.cpp
@@ -714,7 +714,7 @@ WRITE8_MEMBER(sega8_eeprom_device::write_mapper)
}
}
-MACHINE_CONFIG_MEMBER( sega8_eeprom_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega8_eeprom_device::device_add_mconfig)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index 7abcd70c08b..ba46f795885 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -50,7 +50,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit")
-MACHINE_CONFIG_MEMBER( sega_fm_unit_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig)
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
// if this output gain is changed, the gain set when unmute the output need
// to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers.
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index d5cbd9d0183..89e4338ff28 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -154,7 +154,7 @@ ioport_constructor sega_sk1100_device::device_input_ports() const
}
-MACHINE_CONFIG_MEMBER( sega_sk1100_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega_sk1100_device::device_add_mconfig)
/* devices */
MCFG_DEVICE_ADD(UPD9255_0_TAG, I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(sega_sk1100_device, ppi_pa_r))
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index d0d4e6e7293..630aa2b8f96 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -129,7 +129,7 @@ READ32_MEMBER( sms_multitap_device::pixel_r )
}
-MACHINE_CONFIG_MEMBER( sms_multitap_device::device_add_mconfig )
+MACHINE_CONFIG_START(sms_multitap_device::device_add_mconfig)
// Controller subports setup, without the TH callback declaration,
// because the circuit scheme shows TH of subports without connection.
MCFG_SMS_CONTROL_PORT_ADD("ctrl1", sms_control_port_devices, "joypad")
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index 635cefc3dc0..c0599cf0286 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -138,7 +138,7 @@ READ32_MEMBER( sms_rapid_fire_device::pixel_r )
}
-MACHINE_CONFIG_MEMBER( sms_rapid_fire_device::device_add_mconfig )
+MACHINE_CONFIG_START(sms_rapid_fire_device::device_add_mconfig)
MCFG_SMS_CONTROL_PORT_ADD("ctrl", sms_control_port_devices, "joypad")
MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_rapid_fire_device, th_pin_w))
MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_rapid_fire_device, pixel_r))
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index b4f98e2a64f..b6279fb8dff 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -95,6 +95,6 @@ WRITE8_MEMBER(sms_gender_adapter_device::write_ram)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sms_gender_adapter_device::device_add_mconfig )
+MACHINE_CONFIG_START(sms_gender_adapter_device::device_add_mconfig)
MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp
index 0dafcaa52d1..691a2898413 100644
--- a/src/devices/bus/snes/bsx.cpp
+++ b/src/devices/bus/snes/bsx.cpp
@@ -243,15 +243,15 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_rom_bsx_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_bsx_device::device_add_mconfig)
MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom_bsxlo_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_bsxlo_device::device_add_mconfig)
MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom_bsxhi_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_bsxhi_device::device_add_mconfig)
MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index 6b6e7c13abe..824997f6192 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -219,7 +219,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_pfest94_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_pfest94_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index c79ffff523b..192a91e6b0f 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -1142,7 +1142,7 @@ static ADDRESS_MAP_START( sa1_map, AS_PROGRAM, 8, sns_sa1_device )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( sns_sa1_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_sa1_device::device_add_mconfig)
MCFG_CPU_ADD("sa1cpu", G65816, 10000000)
MCFG_CPU_PROGRAM_MAP(sa1_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp
index 3f6a9b1de79..364df253759 100644
--- a/src/devices/bus/snes/sfx.cpp
+++ b/src/devices/bus/snes/sfx.cpp
@@ -85,7 +85,7 @@ WRITE_LINE_MEMBER(sns_rom_superfx_device::snes_extern_irq_w)
}
-MACHINE_CONFIG_MEMBER( sns_rom_superfx_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_superfx_device::device_add_mconfig)
MCFG_CPU_ADD("superfx", SUPERFX, 21480000) /* 21.48MHz */
MCFG_CPU_PROGRAM_MAP(sfx_map)
MCFG_SUPERFX_OUT_IRQ(WRITELINE(sns_rom_superfx_device, snes_extern_irq_w)) /* IRQ line from cart */
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index 05cbe7133b6..88f2f10048d 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -160,7 +160,7 @@ static SLOT_INTERFACE_START(supergb_cart)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( sns_rom_sgb1_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_sgb1_device::device_add_mconfig)
MCFG_CPU_ADD("sgb_cpu", LR35902, 4295454) /* 4.295454 MHz */
MCFG_CPU_PROGRAM_MAP(supergb_map)
MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback))
@@ -186,7 +186,7 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const
}
-MACHINE_CONFIG_MEMBER( sns_rom_sgb2_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_sgb2_device::device_add_mconfig)
MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL_4_194304Mhz) /* 4.194MHz derived from clock on sgb2 pcb */
MCFG_CPU_PROGRAM_MAP(supergb_map)
MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback))
diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp
index aed3545a9d7..9eb2236161c 100644
--- a/src/devices/bus/snes/sufami.cpp
+++ b/src/devices/bus/snes/sufami.cpp
@@ -55,7 +55,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_rom_sufami_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_sufami_device::device_add_mconfig)
MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot1", sufamiturbo_cart, nullptr)
MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot2", sufamiturbo_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp
index 67c5c19facb..c4f58041a9f 100644
--- a/src/devices/bus/snes/upd.cpp
+++ b/src/devices/bus/snes/upd.cpp
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
@@ -185,7 +185,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_rom21_necdsp_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom21_necdsp_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_hirom)
MCFG_CPU_DATA_MAP(dsp_data_map_hirom)
@@ -294,14 +294,14 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sns_rom_seta10dsp_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_seta10dsp_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD96050, 10000000)
MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
MCFG_CPU_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom_seta11dsp_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_seta11dsp_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD96050, 15000000)
MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
MCFG_CPU_DATA_MAP(st01x_data_map)
@@ -405,49 +405,49 @@ sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_c
}
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp1_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp1_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp1b_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp1b_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp2_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp2_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp3_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp3_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom20_necdsp4_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom20_necdsp4_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom21_necdsp1_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom21_necdsp1_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD7725, 8000000)
MCFG_CPU_PROGRAM_MAP(dsp_prg_map_hirom)
MCFG_CPU_DATA_MAP(dsp_data_map_hirom)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom_seta10dsp_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_seta10dsp_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD96050, 10000000)
MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
MCFG_CPU_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sns_rom_seta11dsp_legacy_device::device_add_mconfig )
+MACHINE_CONFIG_START(sns_rom_seta11dsp_legacy_device::device_add_mconfig)
MCFG_CPU_ADD("dsp", UPD96050, 15000000)
MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
MCFG_CPU_DATA_MAP(st01x_data_map)
diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp
index 9d8ac065e29..ddb9b8e18f6 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/snes_ctrl/bcbattle.cpp
@@ -20,7 +20,7 @@
DEFINE_DEVICE_TYPE(SNES_BARCODE_BATTLER, snes_bcbattle_device, "snes_bcbattle", "Epoch Barcode Battler (SFC)")
-MACHINE_CONFIG_MEMBER( snes_bcbattle_device::device_add_mconfig )
+MACHINE_CONFIG_START(snes_bcbattle_device::device_add_mconfig)
MCFG_BARCODE_READER_ADD("battler")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h
index 0d4839980c1..943388e3fa0 100644
--- a/src/devices/bus/snes_ctrl/ctrl.h
+++ b/src/devices/bus/snes_ctrl/ctrl.h
@@ -88,10 +88,10 @@ DECLARE_DEVICE_TYPE(SNES_CONTROL_PORT, snes_control_port_device)
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
#define MCFG_SNESCTRL_ONSCREEN_CB(_class, _method) \
- snes_control_port_device::set_onscreen_callback(*device, snesctrl_onscreen_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ snes_control_port_device::set_onscreen_callback(*device, snesctrl_onscreen_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_SNESCTRL_GUNLATCH_CB(_class, _method) \
- snes_control_port_device::set_gunlatch_callback(*device, snesctrl_gunlatch_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ snes_control_port_device::set_gunlatch_callback(*device, snesctrl_gunlatch_delegate(&_class::_method, #_class "::" #_method, this));
SLOT_INTERFACE_EXTERN( snes_control_port_devices );
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index 1a4c7dc1423..de605138d78 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -23,7 +23,7 @@
DEFINE_DEVICE_TYPE(SNES_MIRACLE, snes_miracle_device, "snes_miracle", "Miracle Piano SNES Cable")
-MACHINE_CONFIG_MEMBER( snes_miracle_device::device_add_mconfig )
+MACHINE_CONFIG_START(snes_miracle_device::device_add_mconfig)
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(snes_miracle_device, rx_w))
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index 9b41e4d6d48..01c91cb8687 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -46,7 +46,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( snes_multitap_device::device_add_mconfig )
+MACHINE_CONFIG_START(snes_multitap_device::device_add_mconfig)
MCFG_SNES_CONTROL_PORT_ADD("port1", snes_multitap, "joypad")
MCFG_SNES_CONTROL_PORT_ADD("port2", snes_multitap, "joypad")
MCFG_SNES_CONTROL_PORT_ADD("port3", snes_multitap, "joypad")
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index fe0f4e4ac80..691d93e2758 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -77,7 +77,7 @@ SLOT_INTERFACE_END
// device_add_mconfig
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( spc1000_fdd_exp_device::device_add_mconfig )
+MACHINE_CONFIG_START(spc1000_fdd_exp_device::device_add_mconfig)
// sub CPU (5 inch floppy drive)
MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz)
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index 92fe25b6fe0..9eedd2feb80 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -23,7 +23,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt)
// device_add_mconfig
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(spc1000_vdp_exp_device::device_add_mconfig)
+MACHINE_CONFIG_START(spc1000_vdp_exp_device::device_add_mconfig)
MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
MCFG_TMS9928A_VRAM_SIZE(0x4000)
diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp
index ca08d967dd7..bebb169b7f3 100644
--- a/src/devices/bus/spectrum/fuller.cpp
+++ b/src/devices/bus/spectrum/fuller.cpp
@@ -44,7 +44,7 @@ ioport_constructor spectrum_fuller_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(spectrum_fuller_device::device_add_mconfig)
+MACHINE_CONFIG_START(spectrum_fuller_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2) // unverified clock
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index e0d627dce70..cf79c71f1f4 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -39,7 +39,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( spectrum_intf1_device::device_add_mconfig )
+MACHINE_CONFIG_START(spectrum_intf1_device::device_add_mconfig)
/* rs232 */
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
diff --git a/src/devices/bus/spectrum/intf2.cpp b/src/devices/bus/spectrum/intf2.cpp
index 1ec809a52cd..0921d50b0bc 100644
--- a/src/devices/bus/spectrum/intf2.cpp
+++ b/src/devices/bus/spectrum/intf2.cpp
@@ -54,7 +54,7 @@ ioport_constructor spectrum_intf2_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( spectrum_intf2_device::device_add_mconfig )
+MACHINE_CONFIG_START(spectrum_intf2_device::device_add_mconfig)
/* cartridge */
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "spectrum_cart")
MCFG_GENERIC_EXTENSIONS("bin,rom")
diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp
index d10742a5512..63b5d3f3cbe 100644
--- a/src/devices/bus/spectrum/melodik.cpp
+++ b/src/devices/bus/spectrum/melodik.cpp
@@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_MELODIK, spectrum_melodik_device, "spectrum_melodik"
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(spectrum_melodik_device::device_add_mconfig)
+MACHINE_CONFIG_START(spectrum_melodik_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2)
diff --git a/src/devices/bus/spectrum/uslot.cpp b/src/devices/bus/spectrum/uslot.cpp
index e85dd989f2a..5fa065f9dfe 100644
--- a/src/devices/bus/spectrum/uslot.cpp
+++ b/src/devices/bus/spectrum/uslot.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_USLOT, spectrum_uslot_device, "spectrum_uslot", "Spe
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(spectrum_uslot_device::device_add_mconfig)
+MACHINE_CONFIG_START(spectrum_uslot_device::device_add_mconfig)
/* passthru */
MCFG_SPECTRUM_EXPANSION_SLOT_ADD("exp1", spectrum_expansion_devices, nullptr)
MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w))
diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp
index 03c1eeb3379..bfbbf9d3516 100644
--- a/src/devices/bus/spectrum/uspeech.cpp
+++ b/src/devices/bus/spectrum/uspeech.cpp
@@ -53,7 +53,7 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( spectrum_uspeech_device::device_add_mconfig )
+MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL_14MHz / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp
index 8a1ac577a5e..90859f8147b 100644
--- a/src/devices/bus/ss50/mpc.cpp
+++ b/src/devices/bus/ss50/mpc.cpp
@@ -101,7 +101,7 @@ DEVICE_INPUT_DEFAULTS_END
// machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(ss50_mpc_device::device_add_mconfig)
+MACHINE_CONFIG_START(ss50_mpc_device::device_add_mconfig)
MCFG_DEVICE_ADD("pia", PIA6821, 0) // actually MC6820
MCFG_PIA_WRITEPA_HANDLER(DEVWRITELINE("outgate", input_merger_device, in_w<0>)) MCFG_DEVCB_BIT(0)
MCFG_PIA_CB2_HANDLER(WRITELINE(ss50_mpc_device, reader_control_w))
diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp
index 11b9051063d..3b0fe928621 100644
--- a/src/devices/bus/ss50/mps.cpp
+++ b/src/devices/bus/ss50/mps.cpp
@@ -97,7 +97,7 @@ DEVICE_INPUT_DEFAULTS_END
// machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(ss50_mps_device::device_add_mconfig)
+MACHINE_CONFIG_START(ss50_mps_device::device_add_mconfig)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
//MCFG_ACIA6850_RTS_HANDLER(WRITELINE(ss50_mps_device, reader_control_w))
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index 8e25d09a028..7a3b01ee219 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -787,7 +787,7 @@ WRITE_LINE_MEMBER( hle_device_base::input_txd )
add machine configuration
--------------------------------------------------*/
-MACHINE_CONFIG_MEMBER(hle_device_base::device_add_mconfig)
+MACHINE_CONFIG_START(hle_device_base::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("bell")
MCFG_SOUND_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0)
diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp
index d290efacee0..9571a43d9d0 100644
--- a/src/devices/bus/svi3x8/expander/sv601.cpp
+++ b/src/devices/bus/svi3x8/expander/sv601.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SV601, sv601_device, "sv601", "SV-601 Super Expander")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv601_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv601_device::device_add_mconfig)
MCFG_SVI_SLOT_BUS_ADD
MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv601_device, int_w))
MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv601_device, romdis_w))
diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp
index de069c3ebbb..59a1e14d458 100644
--- a/src/devices/bus/svi3x8/expander/sv602.cpp
+++ b/src/devices/bus/svi3x8/expander/sv602.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SV602, sv602_device, "sv602", "SV-602 Single Slot Expander")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv602_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv602_device::device_add_mconfig)
MCFG_SVI_SLOT_BUS_ADD
MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv602_device, int_w))
MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv602_device, romdis_w))
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index bb7e24b77dc..c4191bdb7f7 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -37,7 +37,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv603_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv603_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("snd", SN76489A, XTAL_10_738635MHz / 3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h
index f8c6e52314d..722f9aa0c8d 100644
--- a/src/devices/bus/svi3x8/slot/slot.h
+++ b/src/devices/bus/svi3x8/slot/slot.h
@@ -51,7 +51,7 @@
#define MCFG_SVI_SLOT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, SVI_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- svi_slot_device::set_bus(*device, owner, "slotbus");
+ svi_slot_device::set_bus(*device, this, "slotbus");
#define MCFG_SVI_SLOT_INT_HANDLER(_devcb) \
devcb = &svi_slot_bus_device::set_int_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index 5dfa04efbb6..c0f17f0bc60 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -30,7 +30,7 @@ SLOT_INTERFACE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv801_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv801_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL_8MHz / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w))
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index 71f347cba62..a8428a32e4b 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SV802, sv802_device, "sv802", "SV-802 Centronics Printer Inte
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv802_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv802_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sv802_device, busy_w))
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index 5f9915fd271..65ea09ed1d0 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv805_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv805_device::device_add_mconfig)
MCFG_DEVICE_ADD("uart", INS8250, XTAL_3_072MHz)
MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp
index c8c5127c22b..44f6fb7de57 100644
--- a/src/devices/bus/svi3x8/slot/sv806.cpp
+++ b/src/devices/bus/svi3x8/slot/sv806.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *sv806_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sv806_device::device_add_mconfig )
+MACHINE_CONFIG_START(sv806_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192)
MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)
diff --git a/src/devices/bus/ti8x/bitsocket.cpp b/src/devices/bus/ti8x/bitsocket.cpp
index 982a3354580..e9394788d94 100644
--- a/src/devices/bus/ti8x/bitsocket.cpp
+++ b/src/devices/bus/ti8x/bitsocket.cpp
@@ -25,7 +25,7 @@ bit_socket_device::bit_socket_device(
}
-MACHINE_CONFIG_MEMBER(bit_socket_device::device_add_mconfig)
+MACHINE_CONFIG_START(bit_socket_device::device_add_mconfig)
MCFG_DEVICE_ADD("stream", BITBANGER, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti8x/graphlinkhle.cpp b/src/devices/bus/ti8x/graphlinkhle.cpp
index e5df6cc9a12..675fa9b87ed 100644
--- a/src/devices/bus/ti8x/graphlinkhle.cpp
+++ b/src/devices/bus/ti8x/graphlinkhle.cpp
@@ -49,7 +49,7 @@ void graph_link_hle_device::device_reset()
}
-MACHINE_CONFIG_MEMBER(graph_link_hle_device::device_add_mconfig)
+MACHINE_CONFIG_START(graph_link_hle_device::device_add_mconfig)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(WRITELINE(graph_link_hle_device, rx_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti8x/teeconn.cpp b/src/devices/bus/ti8x/teeconn.cpp
index 34a366c3116..cabe956b9da 100644
--- a/src/devices/bus/ti8x/teeconn.cpp
+++ b/src/devices/bus/ti8x/teeconn.cpp
@@ -61,7 +61,7 @@ WRITE_LINE_MEMBER(tee_connector_device::ring_b_w)
}
-MACHINE_CONFIG_MEMBER(tee_connector_device::device_add_mconfig)
+MACHINE_CONFIG_START(tee_connector_device::device_add_mconfig)
MCFG_TI8X_LINK_PORT_ADD("a", default_ti8x_link_devices, nullptr)
MCFG_TI8X_LINK_TIP_HANDLER(WRITELINE(tee_connector_device, tip_a_w))
MCFG_TI8X_LINK_RING_HANDLER(WRITELINE(tee_connector_device, ring_a_w))
diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp
index 867a2ad1939..c3439f56c05 100644
--- a/src/devices/bus/ti8x/tispeaker.cpp
+++ b/src/devices/bus/ti8x/tispeaker.cpp
@@ -26,7 +26,7 @@ stereo_speaker_device::stereo_speaker_device(
}
-MACHINE_CONFIG_MEMBER(stereo_speaker_device::device_add_mconfig)
+MACHINE_CONFIG_START(stereo_speaker_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("outl", "outr")
MCFG_SOUND_ADD("lspkr", SPEAKER_SOUND, 0)
@@ -69,7 +69,7 @@ mono_speaker_device::mono_speaker_device(
}
-MACHINE_CONFIG_MEMBER(mono_speaker_device::device_add_mconfig)
+MACHINE_CONFIG_START(mono_speaker_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("spkr", SPEAKER_SOUND, 0)
diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp
index 24ec2670340..d2d84cdbf47 100644
--- a/src/devices/bus/ti99/gromport/cartridges.cpp
+++ b/src/devices/bus/ti99/gromport/cartridges.cpp
@@ -396,7 +396,7 @@ void ti99_cartridge_device::device_config_complete()
/*
5 GROMs that may be contained in a cartridge
*/
-MACHINE_CONFIG_MEMBER( ti99_cartridge_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti99_cartridge_device::device_add_mconfig)
MCFG_GROM_ADD( GROM3_TAG, 3, CARTGROM_TAG, 0x0000, WRITELINE(ti99_cartridge_device, ready_line))
MCFG_GROM_ADD( GROM4_TAG, 4, CARTGROM_TAG, 0x2000, WRITELINE(ti99_cartridge_device, ready_line))
MCFG_GROM_ADD( GROM5_TAG, 5, CARTGROM_TAG, 0x4000, WRITELINE(ti99_cartridge_device, ready_line))
diff --git a/src/devices/bus/ti99/gromport/gkracker.cpp b/src/devices/bus/ti99/gromport/gkracker.cpp
index 3aadb7a1a7e..6cacbb0e2c7 100644
--- a/src/devices/bus/ti99/gromport/gkracker.cpp
+++ b/src/devices/bus/ti99/gromport/gkracker.cpp
@@ -428,7 +428,7 @@ const tiny_rom_entry *ti99_gkracker_device::device_rom_region() const
return ROM_NAME( gkracker_rom );
}
-MACHINE_CONFIG_MEMBER( ti99_gkracker_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti99_gkracker_device::device_add_mconfig)
MCFG_DEVICE_ADD("cartridge", TI99_CART, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti99/gromport/multiconn.cpp b/src/devices/bus/ti99/gromport/multiconn.cpp
index 25b3201a6c6..8e350cd2f85 100644
--- a/src/devices/bus/ti99/gromport/multiconn.cpp
+++ b/src/devices/bus/ti99/gromport/multiconn.cpp
@@ -296,7 +296,7 @@ void ti99_multi_cart_conn_device::device_reset(void)
m_grom_selected = false;
}
-MACHINE_CONFIG_MEMBER( ti99_multi_cart_conn_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti99_multi_cart_conn_device::device_add_mconfig)
MCFG_DEVICE_ADD("cartridge1", TI99_CART, 0)
MCFG_DEVICE_ADD("cartridge2", TI99_CART, 0)
MCFG_DEVICE_ADD("cartridge3", TI99_CART, 0)
diff --git a/src/devices/bus/ti99/gromport/singleconn.cpp b/src/devices/bus/ti99/gromport/singleconn.cpp
index 88472b1e003..e46dc5becf1 100644
--- a/src/devices/bus/ti99/gromport/singleconn.cpp
+++ b/src/devices/bus/ti99/gromport/singleconn.cpp
@@ -83,7 +83,7 @@ void ti99_single_cart_conn_device::device_reset()
m_cartridge->set_slot(0);
}
-MACHINE_CONFIG_MEMBER( ti99_single_cart_conn_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti99_single_cart_conn_device::device_add_mconfig)
MCFG_DEVICE_ADD("cartridge", TI99_CART, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti99/internal/998board.cpp b/src/devices/bus/ti99/internal/998board.cpp
index 0e3d7663684..4f98f925271 100644
--- a/src/devices/bus/ti99/internal/998board.cpp
+++ b/src/devices/bus/ti99/internal/998board.cpp
@@ -1012,7 +1012,7 @@ void mainboard8_device::device_reset()
m_space = &cpu->space(AS_PROGRAM);
}
-MACHINE_CONFIG_MEMBER( mainboard8_device::device_add_mconfig )
+MACHINE_CONFIG_START(mainboard8_device::device_add_mconfig)
MCFG_DEVICE_ADD(TI998_VAQUERRO_TAG, TI99_VAQUERRO, 0)
MCFG_DEVICE_ADD(TI998_MOFETTA_TAG, TI99_MOFETTA, 0)
MCFG_DEVICE_ADD(TI998_AMIGO_TAG, TI99_AMIGO, 0)
diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp
index 900eddcd422..7a911c6d7fc 100644
--- a/src/devices/bus/ti99/peb/bwg.cpp
+++ b/src/devices/bus/ti99/peb/bwg.cpp
@@ -693,7 +693,7 @@ ROM_START( bwg_fdc )
ROM_LOAD("bwg_dsr.u15", 0x0000, 0x8000, CRC(06f1ec89) SHA1(6ad77033ed268f986d9a5439e65f7d391c4b7651)) /* BwG disk DSR ROM */
ROM_END
-MACHINE_CONFIG_MEMBER( snug_bwg_device::device_add_mconfig )
+MACHINE_CONFIG_START(snug_bwg_device::device_add_mconfig)
MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w))
diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp
index 173a3a607ef..30726024e2c 100644
--- a/src/devices/bus/ti99/peb/evpc.cpp
+++ b/src/devices/bus/ti99/peb/evpc.cpp
@@ -478,7 +478,7 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const
return INPUT_PORTS_NAME(ti99_evpc);
}
-MACHINE_CONFIG_MEMBER( snug_enhanced_video_device::device_add_mconfig )
+MACHINE_CONFIG_START(snug_enhanced_video_device::device_add_mconfig)
// video hardware
MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp
index 160a699966a..f8dc8c1195b 100644
--- a/src/devices/bus/ti99/peb/hfdc.cpp
+++ b/src/devices/bus/ti99/peb/hfdc.cpp
@@ -1071,7 +1071,7 @@ ROM_START( ti99_hfdc )
ROM_END
-MACHINE_CONFIG_MEMBER( myarc_hfdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(myarc_hfdc_device::device_add_mconfig)
MCFG_DEVICE_ADD(FDC_TAG, HDC9234, 0)
MCFG_HDC92X4_INTRQ_CALLBACK(WRITELINE(myarc_hfdc_device, intrq_w))
MCFG_HDC92X4_DIP_CALLBACK(WRITELINE(myarc_hfdc_device, dip_w))
diff --git a/src/devices/bus/ti99/peb/horizon.cpp b/src/devices/bus/ti99/peb/horizon.cpp
index 75dcd3dc492..1df75356d08 100644
--- a/src/devices/bus/ti99/peb/horizon.cpp
+++ b/src/devices/bus/ti99/peb/horizon.cpp
@@ -474,7 +474,7 @@ INPUT_PORTS_START( horizon )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( horizon_ramdisk_device::device_add_mconfig )
+MACHINE_CONFIG_START(horizon_ramdisk_device::device_add_mconfig)
MCFG_RAM_ADD(NVRAMREGION)
MCFG_RAM_DEFAULT_SIZE("16M")
diff --git a/src/devices/bus/ti99/peb/hsgpl.cpp b/src/devices/bus/ti99/peb/hsgpl.cpp
index 003559bed3b..6c020e7527b 100644
--- a/src/devices/bus/ti99/peb/hsgpl.cpp
+++ b/src/devices/bus/ti99/peb/hsgpl.cpp
@@ -696,7 +696,7 @@ INPUT_PORTS_START( ti99_hsgpl)
PORT_DIPSETTING( 0x01, "Normal" )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( snug_high_speed_gpl_device::device_add_mconfig )
+MACHINE_CONFIG_START(snug_high_speed_gpl_device::device_add_mconfig)
MCFG_AT29C040A_ADD( DSR_EEPROM )
MCFG_AT29C040A_ADD( GROM_B_EEPROM )
MCFG_AT29C040A_ADD( GROM_A_EEPROM )
diff --git a/src/devices/bus/ti99/peb/memex.cpp b/src/devices/bus/ti99/peb/memex.cpp
index da676479a1f..bc5cbd5b2f0 100644
--- a/src/devices/bus/ti99/peb/memex.cpp
+++ b/src/devices/bus/ti99/peb/memex.cpp
@@ -147,7 +147,7 @@ INPUT_PORTS_START( memex )
PORT_DIPSETTING( MDIP8, "Lock out pages FC-FF")
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( geneve_memex_device::device_add_mconfig )
+MACHINE_CONFIG_START(geneve_memex_device::device_add_mconfig)
MCFG_RAM_ADD(RAMREGION)
MCFG_RAM_DEFAULT_SIZE("2M")
MCFG_RAM_DEFAULT_VALUE(0)
diff --git a/src/devices/bus/ti99/peb/myarcmem.cpp b/src/devices/bus/ti99/peb/myarcmem.cpp
index 9ea4e98976a..87edccd2164 100644
--- a/src/devices/bus/ti99/peb/myarcmem.cpp
+++ b/src/devices/bus/ti99/peb/myarcmem.cpp
@@ -195,7 +195,7 @@ ROM_START( myarc_exp )
ROM_LOAD("myarc512k_xb2_dsr.bin", 0x0000, 0x2000, CRC(41fbb96d) SHA1(4dc7fdfa46842957bcbb0cf2c37764e4bb6d877a)) /* DSR for Ramdisk etc. */
ROM_END
-MACHINE_CONFIG_MEMBER( myarc_memory_expansion_device::device_add_mconfig )
+MACHINE_CONFIG_START(myarc_memory_expansion_device::device_add_mconfig)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("512k")
MCFG_RAM_DEFAULT_VALUE(0)
diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp
index d30622f6a41..71f4d2148f9 100644
--- a/src/devices/bus/ti99/peb/pcode.cpp
+++ b/src/devices/bus/ti99/peb/pcode.cpp
@@ -353,7 +353,7 @@ ROM_START( ti99_pcode )
ROM_LOAD("pcode_rom1.u18", 0x1000, 0x2000, CRC(46a06b8b) SHA1(24e2608179921aef312cdee6f455e3f46deb30d0)) /* TI P-Code card rom4764 */
ROM_END
-MACHINE_CONFIG_MEMBER( ti_pcode_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti_pcode_card_device::device_add_mconfig)
MCFG_GROM_ADD( PGROM0_TAG, 0, PCODE_GROM_TAG, 0x0000, WRITELINE(ti_pcode_card_device, ready_line))
MCFG_GROM_ADD( PGROM1_TAG, 1, PCODE_GROM_TAG, 0x2000, WRITELINE(ti_pcode_card_device, ready_line))
MCFG_GROM_ADD( PGROM2_TAG, 2, PCODE_GROM_TAG, 0x4000, WRITELINE(ti_pcode_card_device, ready_line))
diff --git a/src/devices/bus/ti99/peb/peribox.cpp b/src/devices/bus/ti99/peb/peribox.cpp
index 7cd218c45cd..be2d8e0e0d2 100644
--- a/src/devices/bus/ti99/peb/peribox.cpp
+++ b/src/devices/bus/ti99/peb/peribox.cpp
@@ -502,7 +502,7 @@ SLOT_INTERFACE_START( peribox_slot )
SLOT_INTERFACE("tifdc", TI99_FDC)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( peribox_device::device_add_mconfig )
+MACHINE_CONFIG_START(peribox_device::device_add_mconfig)
MCFG_PERIBOX_SLOT_ADD( PEBSLOT2, peribox_slot )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slot )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slot )
@@ -539,7 +539,7 @@ SLOT_INTERFACE_START( peribox_slotv )
SLOT_INTERFACE("tifdc", TI99_FDC)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( peribox_ev_device::device_add_mconfig )
+MACHINE_CONFIG_START(peribox_ev_device::device_add_mconfig)
MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT2, peribox_slotv, "evpc" )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slotv )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slotv )
@@ -576,7 +576,7 @@ SLOT_INTERFACE_START( peribox_slotg )
SLOT_INTERFACE("tifdc", TI99_FDC)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( peribox_gen_device::device_add_mconfig )
+MACHINE_CONFIG_START(peribox_gen_device::device_add_mconfig)
MCFG_PERIBOX_SLOT_ADD( PEBSLOT2, peribox_slotg )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slotg )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slotg )
@@ -612,7 +612,7 @@ SLOT_INTERFACE_START( peribox_slotp )
SLOT_INTERFACE("tifdc", TI99_FDC)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( peribox_sg_device::device_add_mconfig )
+MACHINE_CONFIG_START(peribox_sg_device::device_add_mconfig)
MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT2, peribox_slotp, "evpc" )
MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT3, peribox_slotp, "hsgpl" )
MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slotp )
diff --git a/src/devices/bus/ti99/peb/samsmem.cpp b/src/devices/bus/ti99/peb/samsmem.cpp
index ed0ae41a50e..ebbd9e11169 100644
--- a/src/devices/bus/ti99/peb/samsmem.cpp
+++ b/src/devices/bus/ti99/peb/samsmem.cpp
@@ -120,7 +120,7 @@ WRITE_LINE_MEMBER(sams_memory_expansion_device::map_mode_w)
m_map_mode = state;
}
-MACHINE_CONFIG_MEMBER( sams_memory_expansion_device::device_add_mconfig )
+MACHINE_CONFIG_START(sams_memory_expansion_device::device_add_mconfig)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1M")
MCFG_RAM_DEFAULT_VALUE(0)
diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp
index 0ef3def4a56..2793e833518 100644
--- a/src/devices/bus/ti99/peb/spchsyn.cpp
+++ b/src/devices/bus/ti99/peb/spchsyn.cpp
@@ -159,7 +159,7 @@ ROM_START( ti99_speech )
ROM_LOAD("cd2326a.u2b", 0x4000, 0x4000, CRC(65d00401) SHA1(a367242c2c96cebf0e2bf21862f3f6734b2b3020)) // at location u2, top of stack
ROM_END
-MACHINE_CONFIG_MEMBER( ti_speech_synthesizer_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti_speech_synthesizer_device::device_add_mconfig)
MCFG_DEVICE_ADD("vsm", SPEECHROM, 0)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/devices/bus/ti99/peb/ti_32kmem.cpp b/src/devices/bus/ti99/peb/ti_32kmem.cpp
index 02cf5668534..67ef418683a 100644
--- a/src/devices/bus/ti99/peb/ti_32kmem.cpp
+++ b/src/devices/bus/ti99/peb/ti_32kmem.cpp
@@ -100,7 +100,7 @@ void ti_32k_expcard_device::device_start()
{
}
-MACHINE_CONFIG_MEMBER( ti_32k_expcard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti_32k_expcard_device::device_add_mconfig)
MCFG_RAM_ADD(RAMREGION)
MCFG_RAM_DEFAULT_SIZE("32k")
MCFG_RAM_DEFAULT_VALUE(0)
diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp
index c185af4a95b..82ee10722b2 100644
--- a/src/devices/bus/ti99/peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99/peb/ti_fdc.cpp
@@ -449,7 +449,7 @@ ROM_START( ti_fdc )
ROM_LOAD("fdc_dsr.u27", 0x1000, 0x1000, CRC(2c921087) SHA1(3646c3bcd2dce16b918ee01ea65312f36ae811d2)) /* TI disk DSR ROM second 4K */
ROM_END
-MACHINE_CONFIG_MEMBER( ti_fdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig)
MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w))
diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp
index 59e442f2ee5..4c4a9de2ff5 100644
--- a/src/devices/bus/ti99/peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99/peb/ti_rs232.cpp
@@ -1140,7 +1140,7 @@ INPUT_PORTS_START( ti_rs232 )
PORT_CONFSETTING( 0x02, "5-20" )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( ti_rs232_pio_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti_rs232_pio_device::device_add_mconfig)
MCFG_DEVICE_ADD("tms9902_0", TMS9902, 3000000)
MCFG_TMS9902_INT_CB(WRITELINE(ti_rs232_pio_device, int0_callback)) /* called when interrupt pin state changes */
MCFG_TMS9902_RCV_CB(WRITELINE(ti_rs232_pio_device, rcv0_callback)) /* called when a character is received */
diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp
index 949366d1ca1..9908c62debd 100644
--- a/src/devices/bus/ti99/peb/tn_ide.cpp
+++ b/src/devices/bus/ti99/peb/tn_ide.cpp
@@ -366,7 +366,7 @@ INPUT_PORTS_START( tn_ide )
PORT_DIPSETTING( 0x1f00, "1F00" )
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( nouspikel_ide_interface_device::device_add_mconfig )
+MACHINE_CONFIG_START(nouspikel_ide_interface_device::device_add_mconfig)
MCFG_DEVICE_ADD( "ide_rtc", RTC65271, 0 )
MCFG_RTC65271_INTERRUPT_CB(WRITELINE(nouspikel_ide_interface_device, clock_interrupt_callback))
MCFG_ATA_INTERFACE_ADD( "ata", ata_devices, "hdd", nullptr, false)
diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp
index 2a0a5629b94..b8942465c8f 100644
--- a/src/devices/bus/ti99/peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp
@@ -360,7 +360,7 @@ INPUT_PORTS_START( tn_usbsm )
PORT_DIPSETTING( 0x01, "Geneve mode")
INPUT_PORTS_END
-MACHINE_CONFIG_MEMBER( nouspikel_usb_smartmedia_device::device_add_mconfig )
+MACHINE_CONFIG_START(nouspikel_usb_smartmedia_device::device_add_mconfig)
MCFG_DEVICE_ADD("smartmedia", SMARTMEDIA, 0)
MCFG_STRATAFLASH_ADD(STRATA_TAG)
MCFG_RAM_ADD(RAM1_TAG)
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp
index 9c2ce32ae51..9bfef6e075b 100644
--- a/src/devices/bus/ti99x/990_hd.cpp
+++ b/src/devices/bus/ti99x/990_hd.cpp
@@ -1002,7 +1002,7 @@ void ti990_hdc_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ti990_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(ti990_hdc_device::device_add_mconfig)
MCFG_HARDDISK_ADD( "harddisk1" )
MCFG_HARDDISK_LOAD(ti990_hdc_device, ti990_hd)
MCFG_HARDDISK_UNLOAD(ti990_hdc_device, ti990_hd)
diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp
index ceff1dc711a..db41dc94c2b 100644
--- a/src/devices/bus/ti99x/990_tap.cpp
+++ b/src/devices/bus/ti99x/990_tap.cpp
@@ -987,7 +987,7 @@ void tap_990_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( tap_990_device::device_add_mconfig )
+MACHINE_CONFIG_START(tap_990_device::device_add_mconfig)
MCFG_TI990_TAPE_ADD("tape0")
MCFG_TI990_TAPE_ADD("tape1")
MCFG_TI990_TAPE_ADD("tape2")
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index 3b46be60875..71a261df49f 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -65,7 +65,7 @@ ADDRESS_MAP_END
// MACHINE_CONFIG_START( tiki100_8088 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( tiki100_8088_device::device_add_mconfig )
+MACHINE_CONFIG_START(tiki100_8088_device::device_add_mconfig)
MCFG_CPU_ADD(I8088_TAG, I8088, 6000000)
MCFG_CPU_PROGRAM_MAP(i8088_mem)
MCFG_CPU_IO_MAP(i8088_io)
diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp
index b7bdbcad7fe..1807d39b10d 100644
--- a/src/devices/bus/tiki100/hdc.cpp
+++ b/src/devices/bus/tiki100/hdc.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(TIKI100_HDC, tiki100_hdc_device, "tiki100_hdc", "TIKI-100 Win
// MACHINE_CONFIG_START( tiki100_hdc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( tiki100_hdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(tiki100_hdc_device::device_add_mconfig)
MCFG_DEVICE_ADD(WD1010_TAG, WD2010, 5000000)
//MCFG_WD2010_OUT_INTRQ_CB()
MCFG_WD2010_IN_DRDY_CB(VCC)
diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp
index 0c4b1256ce4..6d0a4673cf9 100644
--- a/src/devices/bus/tvc/hbf.cpp
+++ b/src/devices/bus/tvc/hbf.cpp
@@ -83,7 +83,7 @@ void tvc_hbf_device::device_reset()
// device_add_mconfig
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(tvc_hbf_device::device_add_mconfig)
+MACHINE_CONFIG_START(tvc_hbf_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp
index bcddc3e96ae..aa452ba2957 100644
--- a/src/devices/bus/vcs/dpc.cpp
+++ b/src/devices/bus/vcs/dpc.cpp
@@ -266,7 +266,7 @@ void a26_rom_dpc_device::setup_addon_ptr(uint8_t *ptr)
}
-MACHINE_CONFIG_MEMBER( a26_rom_dpc_device::device_add_mconfig )
+MACHINE_CONFIG_START(a26_rom_dpc_device::device_add_mconfig)
MCFG_DEVICE_ADD("dpc", ATARI_DPC, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index 6f21a84b7a8..ab2e9bcf0e7 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -81,7 +81,7 @@ void a26_rom_harmony_device::device_start()
static ADDRESS_MAP_START( harmony_arm7_map, AS_PROGRAM, 32, a26_rom_harmony_device )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( a26_rom_harmony_device::device_add_mconfig )
+MACHINE_CONFIG_START(a26_rom_harmony_device::device_add_mconfig)
MCFG_CPU_ADD("arm", LPC2103, 70000000)
MCFG_CPU_PROGRAM_MAP(harmony_arm7_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index d713f88eca4..db97df33a98 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -87,7 +87,7 @@ void a26_rom_ss_device::device_reset()
}
-MACHINE_CONFIG_MEMBER( a26_rom_ss_device::device_add_mconfig )
+MACHINE_CONFIG_START(a26_rom_ss_device::device_add_mconfig)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(a26_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 46d3d1908a4..bb5d9580403 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *vic20_final_expansion_3_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic20_final_expansion_3_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic20_final_expansion_3_device::device_add_mconfig)
MCFG_AMD_29F040_ADD(AM29F040_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index f999db88a43..fea4153457e 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(VIC20_MEGACART, vic20_megacart_device, "vic20_megacart", "VIC
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic20_megacart_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic20_megacart_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp
index 3bccdcaea77..261ec6a43ef 100644
--- a/src/devices/bus/vic20/speakeasy.cpp
+++ b/src/devices/bus/vic20/speakeasy.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(VIC20_SPEAKEASY, vic20_speakeasy_device, "vic20_speakeasy", "
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic20_speakeasy_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic20_speakeasy_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index 3b03a795a52..daf191aef7b 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(VIC1010, vic1010_device, "vic1010", "VIC-1010 Expansion Modul
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic1010_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic1010_device::device_add_mconfig)
MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot1")
MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot2")
MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot3")
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 056727c4b3a..052c37e5e42 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(VIC1011, vic1011_device, "vic1011", "VIC-1011 RS-232C")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic1011_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic1011_device::device_add_mconfig)
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_rxd))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_h)) MCFG_DEVCB_XOR(1)
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 25e6b6d6804..68f34c644b4 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -97,7 +97,7 @@ WRITE_LINE_MEMBER( vic1112_device::via1_irq_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic1112_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic1112_device::device_add_mconfig)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, DERIVED_CLOCK(1, 1))
MCFG_VIA6522_READPB_HANDLER(READ8(vic1112_device, via0_pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic1112_device, via0_pb_w))
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index 0d1533ed3ad..65fdc84ddba 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -97,7 +97,7 @@ GFXDECODE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic20_video_pak_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic20_video_pak_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, h46505_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*8)
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index 583089f7c0d..a3718338057 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(VP550, vp550_device, "vp550", "VP-550 Super Sound")
// MACHINE_CONFIG_START( vp550 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vp550_device::device_add_mconfig )
+MACHINE_CONFIG_START(vp550_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_CDP1863_ADD(CDP1863_A_TAG, 0, 0)
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 9af34a16325..158dbd49c8f 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -45,7 +45,7 @@ void vp575_device::update_interrupts()
// MACHINE_CONFIG_START( vp575 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vp575_device::device_add_mconfig )
+MACHINE_CONFIG_START(vp575_device::device_add_mconfig)
MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp1_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp1_dma_out_w))
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index 3b23075d47f..0a867628fb4 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -53,7 +53,7 @@ READ_LINE_MEMBER( vp590_device::gd_r )
// MACHINE_CONFIG_START( vp590 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vp590_device::device_add_mconfig )
+MACHINE_CONFIG_START(vp590_device::device_add_mconfig)
MCFG_DEVICE_ADD(CDP1862_TAG, CDP1862, CPD1862_CLOCK)
MCFG_CDP1861_RD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, rd_r))
MCFG_CDP1861_BD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, bd_r))
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index 17eaf4f299c..8d58ee26cb3 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(VP595, vp595_device, "vp595", "VP-595 Simple Sound")
// MACHINE_CONFIG_START( vp595 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vp595_device::device_add_mconfig )
+MACHINE_CONFIG_START(vp595_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_CDP1863_ADD(CDP1863_TAG, 0, CDP1863_XTAL)
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index a6af0cdfd0e..66e057fa084 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -36,7 +36,7 @@ void vp620_device::kb_w(uint8_t data)
// MACHINE_CONFIG_START( vp620 )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vp620_device::device_add_mconfig )
+MACHINE_CONFIG_START(vp620_device::device_add_mconfig)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(vp620_device, kb_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp
index 7391bc27993..36c4523d2e0 100644
--- a/src/devices/bus/vme/vme_fccpu20.cpp
+++ b/src/devices/bus/vme/vme_fccpu20.cpp
@@ -242,7 +242,7 @@ static ADDRESS_MAP_START (cpu20_mem, AS_PROGRAM, 32, vme_fccpu20_device)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(vme_fccpu20_device::device_add_mconfig)
+MACHINE_CONFIG_START(vme_fccpu20_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68020, CLOCK50 / 3) /* Crytstal verified from picture HCI */
MCFG_CPU_PROGRAM_MAP (cpu20_mem)
@@ -305,12 +305,12 @@ MACHINE_CONFIG_MEMBER(vme_fccpu20_device::device_add_mconfig)
MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("mpcc3", mpcc68561_device, cts_w))
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( vme_fccpu20_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu20_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MACHINE_CONFIG_END
// SYS68K/CPU-21S Part No.1 01 041 - 68020 CPU board + FPU 68881 at 12.5 MHz, 512 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21s_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21s_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
@@ -318,7 +318,7 @@ MACHINE_CONFIG_MEMBER( vme_fccpu21s_card_device::device_add_mconfig )
MACHINE_CONFIG_END
// SYS68K/CPU-21 Part No.1 01 001 - 68020 CPU board (CPU-20) + FPU 68881 at 16.7 MHz, 512 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
@@ -326,7 +326,7 @@ MACHINE_CONFIG_MEMBER( vme_fccpu21_card_device::device_add_mconfig )
MACHINE_CONFIG_END
// SYS68K/CPU-21A Part No.1 01 011 - 68020 CPU board + FPU 68881 at 20 MHz, 512 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21a_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21a_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
@@ -334,7 +334,7 @@ MACHINE_CONFIG_MEMBER( vme_fccpu21a_card_device::device_add_mconfig )
MACHINE_CONFIG_END
// SYS68K/CPU-21YA Part No.1 01 061 - 68020 CPU board + FPU 68881 at 20 MHz, 2048 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21ya_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21ya_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
@@ -342,7 +342,7 @@ MACHINE_CONFIG_MEMBER( vme_fccpu21ya_card_device::device_add_mconfig )
MACHINE_CONFIG_END
// SYS68K/CPU-21B Part No.1 01 021 - 68020 CPU board + FPU 68881 at 25 MHz, 512 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21b_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21b_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
@@ -350,7 +350,7 @@ MACHINE_CONFIG_MEMBER( vme_fccpu21b_card_device::device_add_mconfig )
MACHINE_CONFIG_END
// SYS68K/CPU-21YB Part No.1 01 071 - 68020 CPU board + FPU 68881 at 25 MHz, 2048 KB RAM
-MACHINE_CONFIG_MEMBER( vme_fccpu21yb_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_fccpu21yb_card_device::device_add_mconfig)
vme_fccpu20_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("maincpu")
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index 2b6938c6667..001c7bef1ab 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -274,7 +274,7 @@ ROM_START (fcisio1)
ROM_LOAD16_BYTE ("ISIO-1_V2.1_U.BIN", 0xf00000, 0x4000, CRC (67986768) SHA1 (215f7ff90d9dbe2bea54510e3722fb33d4e54193))
ROM_END
-MACHINE_CONFIG_MEMBER (vme_fcisio1_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(vme_fcisio1_card_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68010, CPU_CLOCK / 2)
MCFG_CPU_PROGRAM_MAP (fcisio1_mem)
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 14b142840e9..26cc9dfd60b 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -226,7 +226,7 @@ ROM_START (fcscsi1)
ROM_END
-MACHINE_CONFIG_MEMBER(vme_fcscsi1_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(vme_fcscsi1_card_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68010, CPU_CRYSTAL / 2) /* 7474 based frequency divide by 2 */
MCFG_CPU_PROGRAM_MAP (fcscsi1_mem)
diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp
index 4e6e4d3aa8a..10c0ea842cb 100644
--- a/src/devices/bus/vme/vme_hcpu30.cpp
+++ b/src/devices/bus/vme/vme_hcpu30.cpp
@@ -121,7 +121,7 @@ ioport_constructor vme_hcpu30_card_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(vme_hcpu30_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(vme_hcpu30_card_device::device_add_mconfig)
MCFG_CPU_ADD("maincpu", M68030, 2*16670000)
MCFG_CPU_PROGRAM_MAP(hcpu30_mem)
diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp
index 22a6ef8f7c9..40d2f3bd30e 100644
--- a/src/devices/bus/vme/vme_mvme350.cpp
+++ b/src/devices/bus/vme/vme_mvme350.cpp
@@ -188,7 +188,7 @@ ROM_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vme_mvme350_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_mvme350_card_device::device_add_mconfig)
/* basic machine hardware */
MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP (mvme350_mem)
diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp
index 5d52e09b73b..9ec70e3f851 100644
--- a/src/devices/bus/vme/vme_mzr8105.cpp
+++ b/src/devices/bus/vme/vme_mzr8105.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(VME_MZR8105, vme_mzr8105_card_device, "mzr8105", "Mizar 8105
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(vme_mzr8105_card_device::device_add_mconfig)
+MACHINE_CONFIG_START(vme_mzr8105_card_device::device_add_mconfig)
{
MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp
index 95acacbd39b..6505a681663 100644
--- a/src/devices/bus/vme/vme_mzr8300.cpp
+++ b/src/devices/bus/vme/vme_mzr8300.cpp
@@ -124,7 +124,7 @@ DEFINE_DEVICE_TYPE(VME_MZR8300, vme_mzr8300_card_device, "mzr8300", "Mizar 8300
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vme_mzr8300_card_device::device_add_mconfig )
+MACHINE_CONFIG_START(vme_mzr8300_card_device::device_add_mconfig)
MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL_4MHz)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index 371ab7320c8..f672aaa5973 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(VTECH_PRINTER_INTERFACE, vtech_printer_interface_device, "vte
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vtech_printer_interface_device::device_add_mconfig )
+MACHINE_CONFIG_START(vtech_printer_interface_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(vtech_printer_interface_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics")
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp
index 1da61c4d468..5e4e33dee29 100644
--- a/src/devices/bus/vtech/memexp/floppy.cpp
+++ b/src/devices/bus/vtech/memexp/floppy.cpp
@@ -48,7 +48,7 @@ static SLOT_INTERFACE_START( laser_floppies )
SLOT_INTERFACE("525", FLOPPY_525_SSSD)
SLOT_INTERFACE_END
-MACHINE_CONFIG_MEMBER( vtech_floppy_controller_device::device_add_mconfig )
+MACHINE_CONFIG_START(vtech_floppy_controller_device::device_add_mconfig)
MCFG_MEMEXP_SLOT_ADD("mem")
MCFG_FLOPPY_DRIVE_ADD("0", laser_floppies, "525", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("1", laser_floppies, "525", floppy_image_device::default_floppy_formats)
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index b606c391679..a7289604dda 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -34,7 +34,7 @@ const tiny_rom_entry *vtech_rs232_interface_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vtech_rs232_interface_device::device_add_mconfig )
+MACHINE_CONFIG_START(vtech_rs232_interface_device::device_add_mconfig)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(WRITELINE(vtech_rs232_interface_device, rs232_rx_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp
index cd50495cebe..30694d7d7c8 100644
--- a/src/devices/bus/wangpc/lic.cpp
+++ b/src/devices/bus/wangpc/lic.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *wangpc_lic_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_lic_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_lic_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index e5a0c3e0d44..bc11ac14b8c 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -116,7 +116,7 @@ WRITE_LINE_MEMBER( wangpc_lvc_device::vsync_w )
// MACHINE_CONFIG_START( wangpc_lvc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_lvc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_lvc_device::device_add_mconfig)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 25*9)
diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp
index 2700aadacd8..4babd0c14cf 100644
--- a/src/devices/bus/wangpc/mcc.cpp
+++ b/src/devices/bus/wangpc/mcc.cpp
@@ -55,7 +55,7 @@ DEFINE_DEVICE_TYPE(WANGPC_MCC, wangpc_mcc_device, "wangpc_mcc", "Wang PC-PM043 M
// MACHINE_CONFIG_START( wangpc_mcc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_mcc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_mcc_device::device_add_mconfig)
MCFG_DEVICE_ADD(Z80SIO2_TAG, Z80SIO2, 4000000)
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, 4000000)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index 418b33e5b9a..c4ef69379fe 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -136,7 +136,7 @@ WRITE_LINE_MEMBER( wangpc_mvc_device::vsync_w )
// MACHINE_CONFIG_START( wangpc_mvc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_mvc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_mvc_device::device_add_mconfig)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_SCREEN_SIZE(80*10, 25*12)
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index 7d44d6f3b3b..7bd5013115b 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -103,7 +103,7 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] =
// MACHINE_CONFIG_START( wangpc_rtc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_rtc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_rtc_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 2000000)
MCFG_Z80_DAISY_CHAIN(wangpc_rtc_daisy_chain)
MCFG_CPU_PROGRAM_MAP(wangpc_rtc_mem)
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index d1549eeb15d..a73131b53a7 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -112,7 +112,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels )
// MACHINE_CONFIG_START( wangpc_tig )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_tig_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_tig_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update)
MCFG_SCREEN_SIZE(80*10, 25*12)
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index dee97420274..a5424a8863d 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -90,7 +90,7 @@ ADDRESS_MAP_END
// MACHINE_CONFIG_START( wangpc_wdc )
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wangpc_wdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wangpc_wdc_device::device_add_mconfig)
MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL_10MHz / ?
//MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain)
MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem)
diff --git a/src/devices/bus/x68k/x68k_midi.cpp b/src/devices/bus/x68k/x68k_midi.cpp
index 5b2b8f2e213..7289959627b 100644
--- a/src/devices/bus/x68k/x68k_midi.cpp
+++ b/src/devices/bus/x68k/x68k_midi.cpp
@@ -17,7 +17,7 @@
DEFINE_DEVICE_TYPE(X68K_MIDI, x68k_midi_device, "x68k_midi", "X68000 MIDI Interface")
-MACHINE_CONFIG_MEMBER( x68k_midi_device::device_add_mconfig )
+MACHINE_CONFIG_START(x68k_midi_device::device_add_mconfig)
MCFG_DEVICE_ADD("midi", YM3802, XTAL_1MHz) // clock is unknown
MCFG_YM3802_TXD_HANDLER(DEVWRITELINE("mdout",midi_port_device,write_txd))
MCFG_YM3802_IRQ_HANDLER(WRITELINE(x68k_midi_device,irq_w))
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index a1abc7bd394..6e72a3908a4 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -17,7 +17,7 @@
DEFINE_DEVICE_TYPE(X68K_NEPTUNEX, x68k_neptune_device, "x68k_neptunex", "Neptune-X")
// device machine config
-MACHINE_CONFIG_MEMBER( x68k_neptune_device::device_add_mconfig )
+MACHINE_CONFIG_START(x68k_neptune_device::device_add_mconfig)
MCFG_DEVICE_ADD("dp8390d", DP8390D, 0)
MCFG_DP8390D_IRQ_CB(WRITELINE(x68k_neptune_device, x68k_neptune_irq_w))
MCFG_DP8390D_MEM_READ_CB(READ8(x68k_neptune_device, x68k_neptune_mem_read))
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index 7bb776ac688..464bf40bfbe 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -37,7 +37,7 @@ const tiny_rom_entry *x68k_scsiext_device::device_rom_region() const
}
// device machine config
-MACHINE_CONFIG_MEMBER( x68k_scsiext_device::device_add_mconfig )
+MACHINE_CONFIG_START(x68k_scsiext_device::device_add_mconfig)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE2, "harddisk", SCSIHD, SCSI_ID_1)
diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp
index d082b4b68d5..27de11e5586 100644
--- a/src/devices/bus/z88/flash.cpp
+++ b/src/devices/bus/z88/flash.cpp
@@ -53,7 +53,7 @@ void z88_1024k_flash_device::device_start()
// device_add_mconfig
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(z88_1024k_flash_device::device_add_mconfig)
+MACHINE_CONFIG_START(z88_1024k_flash_device::device_add_mconfig)
MCFG_INTEL_E28F008SA_ADD(FLASH_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index ce70418ce64..1f6f08530f9 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -275,5 +275,5 @@ void lpc210x_device::write_timer(address_space &space, int timer, int offset, ui
-MACHINE_CONFIG_MEMBER( lpc210x_device::device_add_mconfig )
+MACHINE_CONFIG_START(lpc210x_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h
index 82f734d3172..005b30d0f41 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.h
+++ b/src/devices/cpu/e0c6200/e0c6s46.h
@@ -57,7 +57,7 @@ enum
// lcd driver
#define MCFG_E0C6S46_PIXEL_UPDATE_CB(_class, _method) \
- e0c6s46_device::static_set_pixel_update_cb(*device, e0c6s46_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ e0c6s46_device::static_set_pixel_update_cb(*device, e0c6s46_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, this));
#define E0C6S46_PIXEL_UPDATE(name) void name(bitmap_ind16 &bitmap, const rectangle &cliprect, int contrast, int seg, int com, int state)
diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h
index ed2fadd98e9..13320e82a12 100644
--- a/src/devices/cpu/esrip/esrip.h
+++ b/src/devices/cpu/esrip/esrip.h
@@ -29,7 +29,7 @@
devcb = &esrip_device::static_set_status_in_callback(*device, DEVCB_##_read);
#define MCFG_ESRIP_DRAW_CALLBACK_OWNER(_class, _method) \
- esrip_device::static_set_draw_callback(*device, esrip_device::draw_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ esrip_device::static_set_draw_callback(*device, esrip_device::draw_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ESRIP_LBRM_PROM(_tag) \
esrip_device::static_lbrm_prom(*device, _tag);
diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp
index 68ea4cf4860..b2508f22a1c 100644
--- a/src/devices/cpu/h8/h83002.cpp
+++ b/src/devices/cpu/h8/h83002.cpp
@@ -136,7 +136,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83002_device)
AM_RANGE(0xfffff8, 0xfffff9) AM_DEVREADWRITE8("intc", h8h_intc_device, icr_r, icr_w, 0xffff)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h83002_device::device_add_mconfig)
+MACHINE_CONFIG_START(h83002_device::device_add_mconfig)
MCFG_H8H_INTC_ADD("intc")
MCFG_H8_ADC_3337_ADD("adc", "intc", 60)
MCFG_H8_DMA_ADD("dma")
diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp
index ef5e2cec951..84fdc63c3dc 100644
--- a/src/devices/cpu/h8/h83006.cpp
+++ b/src/devices/cpu/h8/h83006.cpp
@@ -135,7 +135,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83006_device)
AM_RANGE(0xffffe8, 0xffffe9) AM_DEVREADWRITE8("adc", h8_adc_device, adcr_r, adcr_w, 0x00ff)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h83006_device::device_add_mconfig)
+MACHINE_CONFIG_START(h83006_device::device_add_mconfig)
MCFG_H8H_INTC_ADD("intc")
MCFG_H8_ADC_3006_ADD("adc", "intc", 23)
MCFG_H8_PORT_ADD("port4", h8_device::PORT_4, 0x00, 0x00)
diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp
index 39cd8e79a12..1daa5ce122c 100644
--- a/src/devices/cpu/h8/h83008.cpp
+++ b/src/devices/cpu/h8/h83008.cpp
@@ -113,7 +113,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83008_device)
AM_RANGE(0xffffe8, 0xffffe9) AM_DEVREADWRITE8("adc", h8_adc_device, adcr_r, adcr_w, 0x00ff)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h83008_device::device_add_mconfig)
+MACHINE_CONFIG_START(h83008_device::device_add_mconfig)
MCFG_H8H_INTC_ADD("intc")
MCFG_H8_ADC_3006_ADD("adc", "intc", 23)
MCFG_H8_PORT_ADD("port4", h8_device::PORT_4, 0x00, 0x00)
diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp
index 75b2489e21f..ef0c32f219b 100644
--- a/src/devices/cpu/h8/h83048.cpp
+++ b/src/devices/cpu/h8/h83048.cpp
@@ -151,7 +151,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83048_device)
AM_RANGE(0xfffff8, 0xfffff9) AM_DEVREADWRITE8("intc", h8h_intc_device, icr_r, icr_w, 0xffff)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h83048_device::device_add_mconfig)
+MACHINE_CONFIG_START(h83048_device::device_add_mconfig)
MCFG_H8H_INTC_ADD("intc")
MCFG_H8_ADC_3337_ADD("adc", "intc", 60)
MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00)
diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp
index 5674a6bf55d..f70ce2ab2ab 100644
--- a/src/devices/cpu/h8/h83337.cpp
+++ b/src/devices/cpu/h8/h83337.cpp
@@ -114,7 +114,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83337_device)
AM_RANGE(0xfff2, 0xfff3) AM_DEVREADWRITE8("port6", h8_port_device, pcr_r, pcr_w, 0xff00)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h83337_device::device_add_mconfig)
+MACHINE_CONFIG_START(h83337_device::device_add_mconfig)
MCFG_H8_INTC_ADD("intc")
MCFG_H8_ADC_3337_ADD("adc", "intc", 35)
MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00)
diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp
index 3c9426e9f9b..e5357d1fa60 100644
--- a/src/devices/cpu/h8/h8s2245.cpp
+++ b/src/devices/cpu/h8/h8s2245.cpp
@@ -175,7 +175,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h8s2245_device)
AM_RANGE(0xfffff8, 0xfffffb) AM_DEVREADWRITE( "timer16:2", h8_timer16_channel_device, tgr_r, tgr_w )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h8s2245_device::device_add_mconfig)
+MACHINE_CONFIG_START(h8s2245_device::device_add_mconfig)
MCFG_H8S_INTC_ADD("intc")
MCFG_H8_ADC_2245_ADD("adc", "intc", 28)
MCFG_H8_DTC_ADD("dtc", "intc", 24)
diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp
index d1aba3eae96..c62bd09fc16 100644
--- a/src/devices/cpu/h8/h8s2320.cpp
+++ b/src/devices/cpu/h8/h8s2320.cpp
@@ -263,7 +263,7 @@ ADDRESS_MAP_END
// TODO: the 2321 doesn't have the dma subdevice
-MACHINE_CONFIG_MEMBER(h8s2320_device::device_add_mconfig)
+MACHINE_CONFIG_START(h8s2320_device::device_add_mconfig)
MCFG_H8S_INTC_ADD("intc")
MCFG_H8_ADC_2320_ADD("adc", "intc", 28)
MCFG_H8_DMA_ADD("dma")
diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp
index 5cdc590575e..31615c24388 100644
--- a/src/devices/cpu/h8/h8s2357.cpp
+++ b/src/devices/cpu/h8/h8s2357.cpp
@@ -209,7 +209,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h8s2357_device)
AM_RANGE(0xfffff8, 0xfffffb) AM_DEVREADWRITE( "timer16:2", h8_timer16_channel_device, tgr_r, tgr_w )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h8s2357_device::device_add_mconfig)
+MACHINE_CONFIG_START(h8s2357_device::device_add_mconfig)
MCFG_H8S_INTC_ADD("intc")
MCFG_H8_ADC_2357_ADD("adc", "intc", 28)
MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00)
diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp
index 7bb73ba90e2..870902edf60 100644
--- a/src/devices/cpu/h8/h8s2655.cpp
+++ b/src/devices/cpu/h8/h8s2655.cpp
@@ -187,7 +187,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, h8s2655_device)
AM_RANGE(0xfffff8, 0xfffffb) AM_DEVREADWRITE( "timer16:2", h8_timer16_channel_device, tgr_r, tgr_w )
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(h8s2655_device::device_add_mconfig)
+MACHINE_CONFIG_START(h8s2655_device::device_add_mconfig)
MCFG_H8S_INTC_ADD("intc")
MCFG_H8_ADC_2655_ADD("adc", "intc", 28)
MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00)
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index d688555d26b..de92ffab75a 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -208,7 +208,7 @@ void i8089_device::state_string_export(const device_state_entry &entry, std::str
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( i8089_device::device_add_mconfig )
+MACHINE_CONFIG_START(i8089_device::device_add_mconfig)
MCFG_I8089_CHANNEL_ADD("1")
MCFG_I8089_CHANNEL_SINTR(WRITELINE(i8089_device, ch1_sintr_w))
MCFG_I8089_CHANNEL_ADD("2")
diff --git a/src/devices/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h
index ad2447b78e7..6d880ccad80 100644
--- a/src/devices/cpu/i86/i286.h
+++ b/src/devices/cpu/i86/i286.h
@@ -163,7 +163,7 @@ private:
};
#define MCFG_80286_A20(_class, _a20_cb) \
- i80286_cpu_device::static_set_a20_callback(*device, i80286_cpu_device::a20_cb(&_class::_a20_cb, (_class *)owner));
+ i80286_cpu_device::static_set_a20_callback(*device, i80286_cpu_device::a20_cb(&_class::_a20_cb, this));
#define MCFG_80286_SHUTDOWN(_devcb) \
devcb = &i80286_cpu_device::static_set_shutdown_callback(*device, DEVCB_##_devcb);
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index f989d8d50f3..c43d388655a 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -86,7 +86,7 @@ READ8_MEMBER(n2a03_device::apu_read_mem)
return mintf->program->read_byte(offset);
}
-MACHINE_CONFIG_MEMBER( n2a03_device::device_add_mconfig )
+MACHINE_CONFIG_START(n2a03_device::device_add_mconfig)
MCFG_SOUND_ADD("nesapu", NES_APU, DERIVED_CLOCK(1,1) )
MCFG_NES_APU_IRQ_HANDLER(WRITELINE(n2a03_device, apu_irq))
MCFG_NES_APU_MEM_READ_CALLBACK(READ8(n2a03_device, apu_read_mem))
diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp
index 2674c73813c..c82852fa1ba 100644
--- a/src/devices/cpu/nec/v53.cpp
+++ b/src/devices/cpu/nec/v53.cpp
@@ -485,7 +485,7 @@ WRITE_LINE_MEMBER(v53_base_device::internal_irq_w)
}
-MACHINE_CONFIG_MEMBER( v53_base_device::device_add_mconfig )
+MACHINE_CONFIG_START(v53_base_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit", PIT8254, 0) // functionality identical to uPD71054
MCFG_PIT8253_CLK0(16000000) // manual implicitly claims that these runs at same speed as the CPU
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index f51a29d5730..e1b395a6478 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -3432,7 +3432,7 @@ device_memory_interface::space_config_vector psxcpu_device::memory_space_config(
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( psxcpu_device::device_add_mconfig )
+MACHINE_CONFIG_START(psxcpu_device::device_add_mconfig)
MCFG_DEVICE_ADD( "irq", PSX_IRQ, 0 )
MCFG_PSX_IRQ_HANDLER( INPUTLINE( DEVICE_SELF, PSXCPU_IRQ0 ) )
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index a8d1652c732..c08538bbdcf 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -115,10 +115,10 @@ enum
//**************************************************************************
#define MCFG_PSX_DMA_CHANNEL_READ( cputag, channel, handler ) \
- psxcpu_device::getcpu( *owner, cputag )->subdevice<psxdma_device>("dma")->install_read_handler( channel, handler );
+ psxcpu_device::getcpu( *this, cputag )->subdevice<psxdma_device>("dma")->install_read_handler( channel, handler );
#define MCFG_PSX_DMA_CHANNEL_WRITE( cputag, channel, handler ) \
- psxcpu_device::getcpu( *owner, cputag )->subdevice<psxdma_device>("dma")->install_write_handler( channel, handler );
+ psxcpu_device::getcpu( *this, cputag )->subdevice<psxdma_device>("dma")->install_write_handler( channel, handler );
#define MCFG_PSX_GPU_READ_HANDLER(_devcb) \
devcb = &psxcpu_device::set_gpu_read_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/cpu/sh/sh2.h b/src/devices/cpu/sh/sh2.h
index 7c15b82d5e4..7027ae959ce 100644
--- a/src/devices/cpu/sh/sh2.h
+++ b/src/devices/cpu/sh/sh2.h
@@ -49,13 +49,13 @@
sh2_device::set_is_slave(*device, _slave);
#define MCFG_SH2_DMA_KLUDGE_CB(_class, _method) \
- sh2_device::set_dma_kludge_callback(*device, sh2_device::dma_kludge_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sh2_device::set_dma_kludge_callback(*device, sh2_device::dma_kludge_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_SH2_FIFO_DATA_AVAIL_CB(_class, _method) \
- sh2_device::set_dma_fifo_data_available_callback(*device, sh2_device::dma_fifo_data_available_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sh2_device::set_dma_fifo_data_available_callback(*device, sh2_device::dma_fifo_data_available_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_SH2_FTCSR_READ_CB(_class, _method) \
- sh2_device::set_ftcsr_read_callback(*device, sh2_device::ftcsr_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sh2_device::set_ftcsr_read_callback(*device, sh2_device::ftcsr_read_delegate(&_class::_method, #_class "::" #_method, this));
class sh2_frontend;
diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp
index 1db3bab8da2..68c15aa2569 100644
--- a/src/devices/cpu/tms1000/tms0270.cpp
+++ b/src/devices/cpu/tms1000/tms0270.cpp
@@ -43,7 +43,7 @@ tms0270_cpu_device::tms0270_cpu_device(const machine_config &mconfig, const char
// machine configs
-MACHINE_CONFIG_MEMBER(tms0270_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms0270_cpu_device::device_add_mconfig)
// main opcodes PLA, microinstructions PLA, output PLA
MCFG_PLA_ADD("ipla", 9, 22, 24)
diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp
index 92e75d9322f..2d28de1c440 100644
--- a/src/devices/cpu/tms1000/tms0970.cpp
+++ b/src/devices/cpu/tms1000/tms0970.cpp
@@ -58,7 +58,7 @@ tms1990_cpu_device::tms1990_cpu_device(const machine_config &mconfig, const char
// machine configs
-MACHINE_CONFIG_MEMBER(tms0950_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms0950_cpu_device::device_add_mconfig)
// microinstructions PLA, output PLA, segment PLA
MCFG_PLA_ADD("mpla", 8, 16, 30)
@@ -69,7 +69,7 @@ MACHINE_CONFIG_MEMBER(tms0950_cpu_device::device_add_mconfig)
MCFG_PLA_FILEFORMAT(BERKELEY)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER(tms0970_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms0970_cpu_device::device_add_mconfig)
// main opcodes PLA, microinstructions PLA, output PLA, segment PLA
MCFG_PLA_ADD("ipla", 8, 15, 18)
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp
index 4ca31ad4330..9ea65497e09 100644
--- a/src/devices/cpu/tms1000/tms0980.cpp
+++ b/src/devices/cpu/tms1000/tms0980.cpp
@@ -59,7 +59,7 @@ tms1980_cpu_device::tms1980_cpu_device(const machine_config &mconfig, const char
// machine configs
-MACHINE_CONFIG_MEMBER(tms0980_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms0980_cpu_device::device_add_mconfig)
// main opcodes PLA, microinstructions PLA, output PLA, segment PLA
MCFG_PLA_ADD("ipla", 9, 22, 24)
@@ -72,7 +72,7 @@ MACHINE_CONFIG_MEMBER(tms0980_cpu_device::device_add_mconfig)
MCFG_PLA_FILEFORMAT(BERKELEY)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER(tms1980_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms1980_cpu_device::device_add_mconfig)
// main opcodes PLA, microinstructions PLA, output PLA
MCFG_PLA_ADD("ipla", 9, 22, 24)
diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index 1f13f8a3d62..3f2bea3dc80 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -103,7 +103,7 @@ mc141200_cpu_device::mc141200_cpu_device(const machine_config &mconfig, const ch
// machine configs
-MACHINE_CONFIG_MEMBER(tms1000_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms1000_cpu_device::device_add_mconfig)
// microinstructions PLA, output PLA
MCFG_PLA_ADD("mpla", 8, 16, 30)
diff --git a/src/devices/cpu/tms1000/tms1000c.cpp b/src/devices/cpu/tms1000/tms1000c.cpp
index e7563fac9d4..c6f2af7f8e9 100644
--- a/src/devices/cpu/tms1000/tms1000c.cpp
+++ b/src/devices/cpu/tms1000/tms1000c.cpp
@@ -41,7 +41,7 @@ tms1000c_cpu_device::tms1000c_cpu_device(const machine_config &mconfig, const ch
// machine configs
-MACHINE_CONFIG_MEMBER(tms1000c_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms1000c_cpu_device::device_add_mconfig)
// microinstructions PLA, output PLA
MCFG_PLA_ADD("mpla", 8, 16, 32)
diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp
index 4c392ec7599..dd36d4b6ee0 100644
--- a/src/devices/cpu/tms1000/tms1400.cpp
+++ b/src/devices/cpu/tms1000/tms1400.cpp
@@ -70,7 +70,7 @@ tms1670_cpu_device::tms1670_cpu_device(const machine_config &mconfig, const char
// machine configs
-MACHINE_CONFIG_MEMBER(tms1400_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tms1400_cpu_device::device_add_mconfig)
// microinstructions PLA, output PLA
MCFG_PLA_ADD("mpla", 8, 16, 30)
diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp
index 8f10c9f2b62..16d2faa63f9 100644
--- a/src/devices/cpu/tms1000/tp0320.cpp
+++ b/src/devices/cpu/tms1000/tp0320.cpp
@@ -45,7 +45,7 @@ tp0320_cpu_device::tp0320_cpu_device(const machine_config &mconfig, const char *
// machine configs
-MACHINE_CONFIG_MEMBER(tp0320_cpu_device::device_add_mconfig)
+MACHINE_CONFIG_START(tp0320_cpu_device::device_add_mconfig)
// main opcodes PLA(partial), microinstructions PLA
MCFG_PLA_ADD("ipla", 9, 6, 8)
diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h
index 0f9c3a27a57..b9c6aaf0795 100644
--- a/src/devices/cpu/tms34010/tms34010.h
+++ b/src/devices/cpu/tms34010/tms34010.h
@@ -115,13 +115,13 @@ enum
#define TMS340X0_SCANLINE_IND16_CB_MEMBER(_name) void _name(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms340x0_device::display_params *params)
#define MCFG_TMS340X0_SCANLINE_IND16_CB(_class, _method) \
- tms340x0_device::set_scanline_ind16_callback(*device, tms340x0_device::scanline_ind16_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ tms340x0_device::set_scanline_ind16_callback(*device, tms340x0_device::scanline_ind16_cb_delegate(&_class::_method, #_class "::" #_method, this));
#define TMS340X0_SCANLINE_RGB32_CB_MEMBER(_name) void _name(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms340x0_device::display_params *params)
#define MCFG_TMS340X0_SCANLINE_RGB32_CB(_class, _method) \
- tms340x0_device::set_scanline_rgb32_callback(*device, tms340x0_device::scanline_rgb32_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ tms340x0_device::set_scanline_rgb32_callback(*device, tms340x0_device::scanline_rgb32_cb_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_TMS340X0_OUTPUT_INT_CB(_devcb) \
@@ -131,13 +131,13 @@ enum
#define TMS340X0_TO_SHIFTREG_CB_MEMBER(_name) void _name(address_space &space, offs_t address, uint16_t *shiftreg)
#define MCFG_TMS340X0_TO_SHIFTREG_CB(_class, _method) \
- tms340x0_device::set_to_shiftreg_callback(*device, tms340x0_device::to_shiftreg_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ tms340x0_device::set_to_shiftreg_callback(*device, tms340x0_device::to_shiftreg_cb_delegate(&_class::_method, #_class "::" #_method, this));
#define TMS340X0_FROM_SHIFTREG_CB_MEMBER(_name) void _name(address_space &space, offs_t address, uint16_t *shiftreg)
#define MCFG_TMS340X0_FROM_SHIFTREG_CB(_class, _method) \
- tms340x0_device::set_from_shiftreg_callback(*device, tms340x0_device::from_shiftreg_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ tms340x0_device::set_from_shiftreg_callback(*device, tms340x0_device::from_shiftreg_cb_delegate(&_class::_method, #_class "::" #_method, this));
class tms340x0_device : public cpu_device,
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index 00a48cd6154..e04cdad91c9 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -46,5 +46,5 @@ void kl5c80a12_device::device_reset()
/* CPU interface */
-MACHINE_CONFIG_MEMBER( kl5c80a12_device::device_add_mconfig )
+MACHINE_CONFIG_START(kl5c80a12_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index c9adb52d97e..ee5e643d42d 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -117,7 +117,7 @@ void tmpz84c011_device::device_reset()
/* CPU interface */
-MACHINE_CONFIG_MEMBER( tmpz84c011_device::device_add_mconfig )
+MACHINE_CONFIG_START(tmpz84c011_device::device_add_mconfig)
MCFG_DEVICE_ADD("tmpz84c011_ctc", Z80CTC, DERIVED_CLOCK(1,1) )
MCFG_Z80CTC_INTR_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(tmpz84c011_device, zc0_cb_trampoline_w))
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 446688306e1..f382920e5ee 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -179,7 +179,7 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
}
}
-MACHINE_CONFIG_MEMBER( tmpz84c015_device::device_add_mconfig )
+MACHINE_CONFIG_START(tmpz84c015_device::device_add_mconfig)
/* basic machine hardware */
MCFG_DEVICE_ADD("tmpz84c015_sio", Z80SIO0, DERIVED_CLOCK(1,1))
diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h
index 087a097ed2a..5f1ed1e141c 100644
--- a/src/devices/imagedev/diablo.h
+++ b/src/devices/imagedev/diablo.h
@@ -81,10 +81,10 @@ DECLARE_DEVICE_TYPE(DIABLO, diablo_image_device)
MCFG_DEVICE_ADD(_tag, DIABLO, 0)
#define MCFG_DIABLO_LOAD(_class,_method) \
- diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), this));
#define MCFG_DIABLO_UNLOAD(_class,_method) \
- diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), this));
#define MCFG_DIABLO_INTERFACE(_interface) \
diablo_image_device::static_set_interface(*device, _interface);
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index deaf8400aec..af759eddace 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -1361,7 +1361,7 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
#define FLOPSPK "flopsndout"
-MACHINE_CONFIG_MEMBER( floppy_image_device::device_add_mconfig )
+MACHINE_CONFIG_START(floppy_image_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO(FLOPSPK)
MCFG_SOUND_ADD(FLOPSND_TAG, FLOPPYSOUND, 44100)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, FLOPSPK, 0.5)
diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h
index bac33321cb6..5c683e54fcf 100644
--- a/src/devices/imagedev/harddriv.h
+++ b/src/devices/imagedev/harddriv.h
@@ -84,10 +84,10 @@ DECLARE_DEVICE_TYPE(HARDDISK, harddisk_image_device)
MCFG_DEVICE_ADD(_tag, HARDDISK, 0)
#define MCFG_HARDDISK_LOAD(_class,_method) \
- harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), this));
#define MCFG_HARDDISK_UNLOAD(_class,_method) \
- harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), downcast<_class *>(owner)));
+ harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), this));
#define MCFG_HARDDISK_INTERFACE(_interface) \
harddisk_image_device::static_set_interface(*device, _interface);
diff --git a/src/devices/machine/53c810.h b/src/devices/machine/53c810.h
index d8115dfb10c..63c01b8511a 100644
--- a/src/devices/machine/53c810.h
+++ b/src/devices/machine/53c810.h
@@ -104,12 +104,12 @@ DECLARE_DEVICE_TYPE(LSI53C810, lsi53c810_device)
#define MCFG_LSI53C810_IRQ_CB(_class, _method) \
- lsi53c810_device::set_irq_callback(*device, lsi53c810_device::irq_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ lsi53c810_device::set_irq_callback(*device, lsi53c810_device::irq_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_LSI53C810_DMA_CB(_class, _method) \
- lsi53c810_device::set_dma_callback(*device, lsi53c810_device::dma_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ lsi53c810_device::set_dma_callback(*device, lsi53c810_device::dma_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_LSI53C810_FETCH_CB(_class, _method) \
- lsi53c810_device::set_fetch_callback(*device, lsi53c810_device::fetch_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ lsi53c810_device::set_fetch_callback(*device, lsi53c810_device::fetch_delegate(&_class::_method, #_class "::" #_method, this));
#endif // MAME_MACHINE_53C810_H
diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp
index 00934d66ff9..30be9ea5e81 100644
--- a/src/devices/machine/68153bim.cpp
+++ b/src/devices/machine/68153bim.cpp
@@ -67,7 +67,7 @@ DEFINE_DEVICE_TYPE(EI68C153, ei68c153_device, "ei68c153", "EPIC
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bim68153_device::device_add_mconfig )
+MACHINE_CONFIG_START(bim68153_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHN0_TAG, MC68153_CHANNEL, 0)
MCFG_DEVICE_ADD(CHN1_TAG, MC68153_CHANNEL, 0)
MCFG_DEVICE_ADD(CHN2_TAG, MC68153_CHANNEL, 0)
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index 38f57097312..1a879b41eae 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -39,7 +39,7 @@ static ADDRESS_MAP_START( m68307_internal_map, AS_PROGRAM, 16, m68307_cpu_device
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( m68307_cpu_device::device_add_mconfig )
+MACHINE_CONFIG_START(m68307_cpu_device::device_add_mconfig)
MCFG_DEVICE_ADD("internal68681", MC68681, 16000000/4) // ?? Mhz - should be specified in inline config
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(m68307_cpu_device, m68307_duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(m68307_cpu_device, m68307_duart_txa))
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index 2701909f18b..8b0f1e8b977 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( m68340_cpu_device::device_add_mconfig )
+MACHINE_CONFIG_START(m68340_cpu_device::device_add_mconfig)
MCFG_DEVICE_ADD("serial", MC68340_SERIAL_MODULE, 0)
MCFG_MC68340SER_IRQ_CALLBACK(DEVWRITELINE("serial", mc68340_serial_module_device, irq_w))
MCFG_DEVICE_ADD("timer1", MC68340_TIMER_MODULE, 0)
diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h
index a3f70b703a1..ffef3a75e07 100644
--- a/src/devices/machine/74148.h
+++ b/src/devices/machine/74148.h
@@ -95,7 +95,7 @@ DECLARE_DEVICE_TYPE(TTL74148, ttl74148_device)
#define MCFG_74148_OUTPUT_CB(_class, _method) \
- ttl74148_device::set_output_callback(*device, ttl74148_output_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ ttl74148_device::set_output_callback(*device, ttl74148_output_delegate(&_class::_method, #_class "::" #_method, this));
#endif // MAME_DEVICES_MACHINE_74148_H
diff --git a/src/devices/machine/74166.cpp b/src/devices/machine/74166.cpp
index f44c846b2e7..07a9de653a5 100644
--- a/src/devices/machine/74166.cpp
+++ b/src/devices/machine/74166.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(TTL166, ttl166_device, "ttl166", "SN54/74166")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ttl166_device::device_add_mconfig )
+MACHINE_CONFIG_START(ttl166_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD("timer", ttl166_device, qh_output)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index 87d97a08a8c..41001422ad6 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -208,7 +208,7 @@ kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag,
{
}
-MACHINE_CONFIG_MEMBER( kbdc8042_device::device_add_mconfig )
+MACHINE_CONFIG_START(kbdc8042_device::device_add_mconfig)
MCFG_AT_KEYB_ADD("at_keyboard", 1, WRITELINE(kbdc8042_device, keyboard_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h
index 1a63e78c184..bc28d912f20 100644
--- a/src/devices/machine/adc0808.h
+++ b/src/devices/machine/adc0808.h
@@ -43,34 +43,34 @@
devcb = &adc0808_device::set_out_eoc_callback(*device, DEVCB_##_devcb);
#define MCFG_ADC0808_IN_VREF_POS_CB(_class, _method) \
- adc0808_device::set_in_vref_pos_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_vref_pos_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_VREF_NEG_CB(_class, _method) \
- adc0808_device::set_in_vref_neg_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_vref_neg_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_0_CB(_class, _method) \
- adc0808_device::set_in_in_0_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_0_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_1_CB(_class, _method) \
- adc0808_device::set_in_in_1_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_1_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_2_CB(_class, _method) \
- adc0808_device::set_in_in_2_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_2_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_3_CB(_class, _method) \
- adc0808_device::set_in_in_3_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_3_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_4_CB(_class, _method) \
- adc0808_device::set_in_in_4_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_4_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_5_CB(_class, _method) \
- adc0808_device::set_in_in_5_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_5_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_6_CB(_class, _method) \
- adc0808_device::set_in_in_6_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_6_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC0808_IN_IN_7_CB(_class, _method) \
- adc0808_device::set_in_in_7_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc0808_device::set_in_in_7_callback(*device, adc0808_device::analog_read_delegate(&_class::_method, #_class "::" #_method, this));
// ======================> adc0808_device
diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h
index 5af0e02cbb5..35e98621f92 100644
--- a/src/devices/machine/adc083x.h
+++ b/src/devices/machine/adc083x.h
@@ -21,7 +21,7 @@
#define ADC083X_INPUT_CB(name) double name(uint8_t input)
#define MCFG_ADC083X_INPUT_CB(_class, _method) \
- adc083x_device::set_input_callback(*device, adc083x_device::input_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc083x_device::set_input_callback(*device, adc083x_device::input_delegate(&_class::_method, #_class "::" #_method, this));
/***************************************************************************
CONSTANTS
diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h
index 32787e36181..1d843d63321 100644
--- a/src/devices/machine/adc1038.h
+++ b/src/devices/machine/adc1038.h
@@ -63,7 +63,7 @@ DECLARE_DEVICE_TYPE(ADC1038, adc1038_device)
#define MCFG_ADC1038_INPUT_CB(_class, _method) \
- adc1038_device::set_input_callback(*device, adc1038_device::input_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc1038_device::set_input_callback(*device, adc1038_device::input_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_ADC1038_GTIHACK(_hack) \
adc1038_device::set_gti_club_hack(*device, _hack);
diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h
index 9f2eb7552fd..d6c5cb7cefc 100644
--- a/src/devices/machine/adc1213x.h
+++ b/src/devices/machine/adc1213x.h
@@ -88,6 +88,6 @@ DECLARE_DEVICE_TYPE(ADC12132, adc12132_device)
#define MCFG_ADC1213X_IPT_CONVERT_CB(_class, _method) \
- adc12138_device::set_ipt_convert_callback(*device, adc12138_device::ipt_convert_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ adc12138_device::set_ipt_convert_callback(*device, adc12138_device::ipt_convert_delegate(&_class::_method, #_class "::" #_method, this));
#endif // MAME_MACHINE_ADC1213X_H
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 469c42cf169..19a6a3c9395 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(AKIKO, akiko_device, "akiko", "CBM AKIKO")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( akiko_device::device_add_mconfig )
+MACHINE_CONFIG_START(akiko_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index 93ced76f54c..e8d8d2b1b9e 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -78,7 +78,7 @@ ioport_constructor at_keyboard_controller_device::device_input_ports() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( at_keyboard_controller_device::device_add_mconfig )
+MACHINE_CONFIG_START(at_keyboard_controller_device::device_add_mconfig)
MCFG_CPU_ADD("at_keybc", I8042, DERIVED_CLOCK(1,1))
MCFG_MCS48_PORT_T0_IN_CB(READLINE(at_keyboard_controller_device, t0_r))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(at_keyboard_controller_device, t1_r))
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index 7de3514a852..36745d36b8d 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -273,7 +273,7 @@ void abstract_ata_interface_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( abstract_ata_interface_device::device_add_mconfig )
+MACHINE_CONFIG_START(abstract_ata_interface_device::device_add_mconfig)
MCFG_DEVICE_ADD( "0", ATA_SLOT, 0 )
MCFG_DEVICE_ADD( "1", ATA_SLOT, 0 )
MACHINE_CONFIG_END
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index b3a469896a8..81799b89ff3 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -30,7 +30,7 @@ atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( atapi_cdrom_device::device_add_mconfig )
+MACHINE_CONFIG_START(atapi_cdrom_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_SOUND_ADD("cdda", CDDA, 0)
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index 14e43330843..820de5f9793 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(CR511B, cr511b_device, "cr511b", "CR-511-B CD-ROM drive")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cr511b_device::device_add_mconfig )
+MACHINE_CONFIG_START(cr511b_device::device_add_mconfig)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_SOUND_ADD("cdda", CDDA, 0)
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index 05f92c3d355..66eb283359d 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -96,7 +96,7 @@ const float cs4031_device::m_dma_clock_divider[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cs4031_device::device_add_mconfig )
+MACHINE_CONFIG_START(cs4031_device::device_add_mconfig)
MCFG_DEVICE_ADD("dma1", AM9517A, 0)
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(cs4031_device, dma1_eop_w))
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index 69b76b3c409..669285ccb08 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -1442,7 +1442,7 @@ void diablo_hd_device::device_timer(emu_timer &timer, device_timer_id id, int pa
}
}
-MACHINE_CONFIG_MEMBER( diablo_hd_device::device_add_mconfig )
+MACHINE_CONFIG_START(diablo_hd_device::device_add_mconfig)
MCFG_DIABLO_ADD("drive")
MACHINE_CONFIG_END
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index 05c0f213699..3cc3b07b524 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -44,7 +44,7 @@
//**************************************************************************
#define MCFG_F3853_EXT_INPUT_CB(_class, _method) \
- f3853_device::set_interrupt_req_callback(*device, f3853_device::interrupt_req_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ f3853_device::set_interrupt_req_callback(*device, f3853_device::interrupt_req_delegate(&_class::_method, #_class "::" #_method, this));
/***************************************************************************
TYPE DEFINITIONS
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 9dd01fa3c9c..97790044994 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -49,7 +49,7 @@ void fdc37c665gt_device::device_start()
{
}
-MACHINE_CONFIG_MEMBER(fdc37c665gt_device::device_add_mconfig)
+MACHINE_CONFIG_START(fdc37c665gt_device::device_add_mconfig)
MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz/13)
MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz/13)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index 74180d23423..7cc13629778 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -405,7 +405,7 @@ DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 51
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ibm5160_mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(ibm5160_mb_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12.0) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
@@ -596,7 +596,7 @@ DEFINE_DEVICE_TYPE(IBM5150_MOTHERBOARD, ibm5150_mb_device, "ibm5150_mb", "IBM 51
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ibm5150_mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(ibm5150_mb_device::device_add_mconfig)
ibm5160_mb_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("pc_kbdc")
@@ -774,7 +774,7 @@ DEFINE_DEVICE_TYPE(EC1841_MOTHERBOARD, ec1841_mb_device, "ec1841_mb", "EC-1840 m
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ec1841_mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(ec1841_mb_device::device_add_mconfig)
ibm5160_mb_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("ppi8255")
@@ -901,7 +901,7 @@ pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, device_typ
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pc_noppi_mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc_noppi_mb_device::device_add_mconfig)
ibm5160_mb_device::device_add_mconfig(config);
MCFG_DEVICE_REMOVE("pc_kbdc")
diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h
index e932b965d0d..852255b2687 100644
--- a/src/devices/machine/gt64xxx.h
+++ b/src/devices/machine/gt64xxx.h
@@ -36,7 +36,7 @@
downcast<gt64xxx_device *>(device)->set_irq_info(_irq_num);
#define MCFG_GT64XXX_SET_CS(_cs_num, _map) \
- downcast<gt64xxx_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), owner);
+ downcast<gt64xxx_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), this);
#define MCFG_GT64XX_SET_SIMM(_index, _size) \
downcast<gt64xxx_device *>(device)->set_simm_size(_index, _size);
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 9102a914d79..4e5a1e1f479 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -98,7 +98,7 @@ const tiny_rom_entry *i80130_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( i80130_device::device_add_mconfig )
+MACHINE_CONFIG_START(i80130_device::device_add_mconfig)
MCFG_DEVICE_ADD("pic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(WRITELINE(i80130_device, irq_w))
diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp
index 611c4fc6481..1acf3c472e3 100644
--- a/src/devices/machine/i82371sb.cpp
+++ b/src/devices/machine/i82371sb.cpp
@@ -57,7 +57,7 @@ ADDRESS_MAP_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( i82371sb_isa_device::device_add_mconfig )
+MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i82371sb_isa_device, at_pit8254_out0_changed))
@@ -161,7 +161,12 @@ MACHINE_CONFIG_MEMBER( i82371sb_isa_device::device_add_mconfig )
// MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa_onboard, "comat", true)
// MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa_onboard, "lpt", true)
// VGA-HACK
- MCFG_FRAGMENT_ADD( pcvideo_vga );
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
+
+ MCFG_PALETTE_ADD("palette", 0x100)
+ MCFG_DEVICE_ADD("vga", VGA, 0)
// end-VGA-HACK
MACHINE_CONFIG_END
diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp
index f5315b7fc5d..b9f6ddbbe70 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -869,6 +869,6 @@ uint8_t ide_hdd_device::calculate_status()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ide_hdd_device::device_add_mconfig )
+MACHINE_CONFIG_START(ide_hdd_device::device_add_mconfig)
MCFG_HARDDISK_ADD( "image" )
MACHINE_CONFIG_END
diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp
index 28977011efb..2e57425f59e 100644
--- a/src/devices/machine/ie15.cpp
+++ b/src/devices/machine/ie15.cpp
@@ -564,7 +564,7 @@ static GFXDECODE_START( ie15 )
GFXDECODE_ENTRY("chargen", 0x0000, ie15_charlayout, 0, 1)
GFXDECODE_END
-static MACHINE_CONFIG_START( ie15core )
+MACHINE_CONFIG_START(ie15_device::ie15core)
/* Basic machine hardware */
MCFG_CPU_ADD("maincpu", IE15_CPU, XTAL_30_8MHz/10)
MCFG_CPU_PROGRAM_MAP(ie15_mem)
@@ -599,7 +599,7 @@ ROM_START( ie15 )
ROM_LOAD("chargen-15ie.bin", 0x0000, 0x0800, CRC(ed16bf6b) SHA1(6af9fb75f5375943d5c0ce9ed408e0fb4621b17e))
ROM_END
-MACHINE_CONFIG_MEMBER( ie15_device::device_add_mconfig )
+MACHINE_CONFIG_START(ie15_device::device_add_mconfig)
MCFG_FRAGMENT_ADD(ie15core)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/devices/machine/ie15.h b/src/devices/machine/ie15.h
index 9898323c539..447616de49e 100644
--- a/src/devices/machine/ie15.h
+++ b/src/devices/machine/ie15.h
@@ -57,6 +57,8 @@ protected:
void term_write(uint8_t data) { m_serial_rx_char = data; m_serial_rx_ready = IE_FALSE; }
+ void ie15core(machine_config &config);
+
public:
DECLARE_WRITE16_MEMBER(kbd_put);
DECLARE_WRITE_LINE_MEMBER(serial_rx_callback);
diff --git a/src/devices/machine/ie15_kbd.cpp b/src/devices/machine/ie15_kbd.cpp
index 2bd28323054..c31dacea1bb 100644
--- a/src/devices/machine/ie15_kbd.cpp
+++ b/src/devices/machine/ie15_kbd.cpp
@@ -122,7 +122,7 @@ const tiny_rom_entry *ie15_keyboard_device::device_rom_region() const
return ROM_NAME( ie15_keyboard );
}
-MACHINE_CONFIG_MEMBER( ie15_keyboard_device::device_add_mconfig )
+MACHINE_CONFIG_START(ie15_keyboard_device::device_add_mconfig)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index aaab13a5e39..827d81dff80 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -372,7 +372,7 @@ const tiny_rom_entry *pioneer_pr8210_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pioneer_pr8210_device::device_add_mconfig )
+MACHINE_CONFIG_START(pioneer_pr8210_device::device_add_mconfig)
MCFG_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
MCFG_CPU_IO_MAP(pr8210_portmap)
MCFG_MCS48_PORT_BUS_IN_CB(READ8(pioneer_pr8210_device, i8049_bus_r))
@@ -999,7 +999,7 @@ const tiny_rom_entry *simutrek_special_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( simutrek_special_device::device_add_mconfig )
+MACHINE_CONFIG_START(simutrek_special_device::device_add_mconfig)
MCFG_CPU_ADD("simutrek", I8748, XTAL_6MHz)
MCFG_CPU_IO_MAP(simutrek_portmap)
MCFG_MCS48_PORT_P2_IN_CB(READ8(simutrek_special_device, i8748_port2_r))
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 4b0dafd2390..7eb0683dda6 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -270,7 +270,7 @@ const tiny_rom_entry *pioneer_ldv1000_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pioneer_ldv1000_device::device_add_mconfig )
+MACHINE_CONFIG_START(pioneer_ldv1000_device::device_add_mconfig)
MCFG_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_CPU_PROGRAM_MAP(ldv1000_map)
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 755d3df893e..c15d7842791 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -285,7 +285,7 @@ const tiny_rom_entry *phillips_22vp931_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( phillips_22vp931_device::device_add_mconfig )
+MACHINE_CONFIG_START(phillips_22vp931_device::device_add_mconfig)
MCFG_CPU_ADD("vp931", I8049, XTAL_11MHz)
MCFG_CPU_IO_MAP(vp931_portmap)
MCFG_MCS48_PORT_P1_IN_CB(READ8(phillips_22vp931_device, i8049_port1_r))
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index a520829e57b..5701c1af7ee 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -60,7 +60,7 @@ linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_c
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) );
}
-MACHINE_CONFIG_MEMBER( linear_flash_pccard_16mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(linear_flash_pccard_16mb_device::device_add_mconfig)
MCFG_FUJITSU_29F016A_ADD("1l")
MCFG_FUJITSU_29F016A_ADD("1u")
MCFG_FUJITSU_29F016A_ADD("2l")
@@ -98,7 +98,7 @@ linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_c
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) );
}
-MACHINE_CONFIG_MEMBER( linear_flash_pccard_32mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(linear_flash_pccard_32mb_device::device_add_mconfig)
MCFG_FUJITSU_29F016A_ADD("1l")
MCFG_FUJITSU_29F016A_ADD("1u")
MCFG_FUJITSU_29F016A_ADD("2l")
@@ -160,7 +160,7 @@ linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_c
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) );
}
-MACHINE_CONFIG_MEMBER( linear_flash_pccard_64mb_device::device_add_mconfig )
+MACHINE_CONFIG_START(linear_flash_pccard_64mb_device::device_add_mconfig)
MCFG_FUJITSU_29F016A_ADD("1l")
MCFG_FUJITSU_29F016A_ADD("1u")
MCFG_FUJITSU_29F016A_ADD("2l")
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index 4efeb7ef71e..223e770a63f 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -134,7 +134,7 @@ WRITE8_MEMBER( mb89363b_device::write )
}
-MACHINE_CONFIG_MEMBER( mb89363b_device::device_add_mconfig )
+MACHINE_CONFIG_START(mb89363b_device::device_add_mconfig)
MCFG_DEVICE_ADD("i8255_a", I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(mb89363b_device, i8255_a_port_a_r))
MCFG_I8255_IN_PORTB_CB(READ8(mb89363b_device, i8255_a_port_b_r))
diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h
index 93caf9a5a0a..a1ae7d5801b 100644
--- a/src/devices/machine/mc6854.h
+++ b/src/devices/machine/mc6854.h
@@ -24,7 +24,7 @@
devcb = &mc6854_device::set_out_txd_callback(*device, DEVCB_##_devcb);
#define MCFG_MC6854_OUT_FRAME_CB(_class, _method) \
- mc6854_device::set_out_frame_callback(*device, mc6854_device::out_frame_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6854_device::set_out_frame_callback(*device, mc6854_device::out_frame_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6854_OUT_RTS_CB(_devcb) \
devcb = &mc6854_device::set_out_rts_callback(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index a75d9acbade..015997b8db3 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -210,19 +210,19 @@ void mc68681_device::device_reset()
m_read_vector = false;
}
-MACHINE_CONFIG_MEMBER( duart_base_device::device_add_mconfig )
+MACHINE_CONFIG_START(duart_base_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( sc28c94_device::device_add_mconfig )
+MACHINE_CONFIG_START(sc28c94_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANC_TAG, DUART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHAND_TAG, DUART_CHANNEL, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( mc68340_duart_device::device_add_mconfig )
+MACHINE_CONFIG_START(mc68340_duart_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index ecb16e5b622..696807f044c 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -76,6 +76,6 @@ DECLARE_DEVICE_TYPE(MICROTOUCH, microtouch_device)
devcb = &microtouch_device::static_set_stx_callback(*device, DEVCB_##_devcb);
#define MCFG_MICROTOUCH_TOUCH_CB(_class, _touch_cb) \
- microtouch_device::static_set_touch_callback(*device, microtouch_device::touch_cb(&_class::_touch_cb, (_class *)owner));
+ microtouch_device::static_set_touch_callback(*device, microtouch_device::touch_cb(&_class::_touch_cb, this));
#endif // MAME_MACHINE_MICROTCH_H
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 1550772ae55..4ce1b97c3eb 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -63,7 +63,7 @@ const int mos6551_device::transmitter_controls[4][3] =
{0, 1, 1}
};
-MACHINE_CONFIG_MEMBER( mos6551_device::device_add_mconfig )
+MACHINE_CONFIG_START(mos6551_device::device_add_mconfig)
MCFG_DEVICE_ADD("clock", CLOCK, 0)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(mos6551_device, internal_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index 74987a918e8..f738050a7b1 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -85,7 +85,7 @@ DEFINE_DEVICE_TYPE(MPU401, mpu401_device, "mpu401", "Roland MPU-401 I/O box")
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( mpu401_device::device_add_mconfig )
+MACHINE_CONFIG_START(mpu401_device::device_add_mconfig)
MCFG_CPU_ADD(M6801_TAG, M6801, 4000000) /* 4 MHz as per schematics */
MCFG_CPU_PROGRAM_MAP(mpu401_map)
MCFG_CPU_IO_MAP(mpu401_io_map)
diff --git a/src/devices/machine/msm6253.h b/src/devices/machine/msm6253.h
index ce133438b30..01edcbe1812 100644
--- a/src/devices/machine/msm6253.h
+++ b/src/devices/machine/msm6253.h
@@ -37,13 +37,13 @@
msm6253_device::static_set_input_tag(*device, 3, "^" _input);
#define MCFG_MSM6253_IN0_ANALOG_READ(_class, _method) \
- msm6253_device::static_set_input_cb(*device, 0, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ msm6253_device::static_set_input_cb(*device, 0, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MSM6253_IN1_ANALOG_READ(_class, _method) \
- msm6253_device::static_set_input_cb(*device, 1, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ msm6253_device::static_set_input_cb(*device, 1, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MSM6253_IN2_ANALOG_READ(_class, _method) \
- msm6253_device::static_set_input_cb(*device, 2, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ msm6253_device::static_set_input_cb(*device, 2, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MSM6253_IN3_ANALOG_READ(_class, _method) \
- msm6253_device::static_set_input_cb(*device, 3, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ msm6253_device::static_set_input_cb(*device, 3, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MSM6253_IN0_ANALOG_DEVREAD(_tag, _class, _method) \
msm6253_device::static_set_input_cb(*device, 0, msm6253_device::port_read_delegate(&_class::_method, #_class "::" #_method, _tag));
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp
index 3f3c97589cc..4a9de7c01ac 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/machine/nscsi_cd.cpp
@@ -31,7 +31,7 @@ void nscsi_cdrom_device::device_reset()
cur_lba = -1;
}
-MACHINE_CONFIG_MEMBER(nscsi_cdrom_device::device_add_mconfig)
+MACHINE_CONFIG_START(nscsi_cdrom_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
MACHINE_CONFIG_END
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp
index 607f55427e0..7f480169715 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/machine/nscsi_hd.cpp
@@ -52,7 +52,7 @@ void nscsi_harddisk_device::device_reset()
cur_lba = -1;
}
-MACHINE_CONFIG_MEMBER(nscsi_harddisk_device::device_add_mconfig)
+MACHINE_CONFIG_START(nscsi_harddisk_device::device_add_mconfig)
MCFG_HARDDISK_ADD("image")
MCFG_HARDDISK_INTERFACE("scsi_hdd")
MACHINE_CONFIG_END
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index 08ef0ca87e3..32d19768d99 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -61,7 +61,7 @@ void pc_fdc_family_device::dma_w(uint8_t data)
fdc->dma_w(data);
}
-MACHINE_CONFIG_MEMBER( pc_fdc_family_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc_fdc_family_device::device_add_mconfig)
MCFG_UPD765A_ADD("upd765", false, false)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc_fdc_family_device, irq_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc_fdc_family_device, drq_w))
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index db9f4639d93..c67bd71e4e3 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -46,7 +46,7 @@ void pc_lpt_device::device_reset()
m_cent_ctrl_out->write(m_control);
}
-MACHINE_CONFIG_MEMBER( pc_lpt_device::device_add_mconfig )
+MACHINE_CONFIG_START(pc_lpt_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3))
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index 790240792f1..deaa2c1b944 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -47,7 +47,7 @@ DEVICE_ADDRESS_MAP_START(bus_master_map, 32, ide_pci_device)
AM_RANGE(0x8, 0xf) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, bmdma_r, bmdma_w)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(ide_pci_device::device_add_mconfig)
+MACHINE_CONFIG_START(ide_pci_device::device_add_mconfig)
MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", "cdrom", true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(ide_pci_device, ide_interrupt))
//MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
diff --git a/src/devices/machine/pci9050.h b/src/devices/machine/pci9050.h
index 41b81a4d516..61e9b703aa8 100644
--- a/src/devices/machine/pci9050.h
+++ b/src/devices/machine/pci9050.h
@@ -19,7 +19,7 @@
MCFG_PCI_DEVICE_ADD(_tag, PCI9050, 0x10b59050, 0x01, 0x06800000, 0x10b59050)
#define MCFG_PCI9050_SET_MAP(id, map) \
- downcast<pci9050_device *>(device)->set_map(id, address_map_delegate(ADDRESS_MAP_NAME(map), #map), owner);
+ downcast<pci9050_device *>(device)->set_map(id, address_map_delegate(ADDRESS_MAP_NAME(map), #map), this);
#define MCFG_PCI9050_USER_INPUT_CALLBACK(_write) \
devcb = &pci9050_device::set_user_input_callback(*device, DEVCB_##_write);
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 7b4642bcb5d..5c2576f3f91 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -251,7 +251,7 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( pdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(pdc_device::device_add_mconfig)
/* CPU - Zilog Z0840006PSC */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz / 2)
MCFG_CPU_PROGRAM_MAP(pdc_mem)
diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp
index 8d2df31f98c..9ccf996782c 100644
--- a/src/devices/machine/scnxx562.cpp
+++ b/src/devices/machine/scnxx562.cpp
@@ -126,7 +126,7 @@ DEFINE_DEVICE_TYPE(DUSCC68C562, duscc68c562_device, "duscc68c562", "Philips
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( duscc_device::device_add_mconfig )
+MACHINE_CONFIG_START(duscc_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, DUSCC_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, DUSCC_CHANNEL, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp
index 71ed1f03e04..6581ed6510d 100644
--- a/src/devices/machine/sega_scu.cpp
+++ b/src/devices/machine/sega_scu.cpp
@@ -183,7 +183,7 @@ WRITE16_MEMBER(sega_scu_device::scudsp_dma_w)
m_hostspace->write_word(addr, data,mem_mask);
}
-MACHINE_CONFIG_MEMBER(sega_scu_device::device_add_mconfig)
+MACHINE_CONFIG_START(sega_scu_device::device_add_mconfig)
MCFG_CPU_ADD("scudsp", SCUDSP, XTAL_57_2727MHz/4) // 14 MHz
MCFG_SCUDSP_OUT_IRQ_CB(DEVWRITELINE(DEVICE_SELF, sega_scu_device, scudsp_end_w))
MCFG_SCUDSP_IN_DMA_CB(READ16(sega_scu_device, scudsp_dma_r))
diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp
index 572bc5dd28b..cd02c3bbda2 100644
--- a/src/devices/machine/sis85c496.cpp
+++ b/src/devices/machine/sis85c496.cpp
@@ -45,7 +45,7 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, sis85c496_host_device)
AM_INHERIT_FROM(pci_host_device::io_configuration_access_map)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(sis85c496_host_device::device_add_mconfig)
+MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(sis85c496_host_device, at_pit8254_out0_changed))
diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp
index f8705686e20..c86de2a2e2e 100644
--- a/src/devices/machine/smioc.cpp
+++ b/src/devices/machine/smioc.cpp
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( smioc_mem, AS_PROGRAM, 8, smioc_device )
AM_RANGE(0xF8000, 0xFFFFF) AM_ROM AM_REGION("rom", 0)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER( smioc_device::device_add_mconfig )
+MACHINE_CONFIG_START(smioc_device::device_add_mconfig)
/* CPU - Intel 80C188 */
MCFG_CPU_ADD(I188_TAG, I80188, XTAL_20MHz / 2) // Clock division unknown
MCFG_CPU_PROGRAM_MAP(smioc_mem)
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index ae017133bcc..a508c3c344d 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -247,7 +247,7 @@ void smpc_hle_device::static_set_control_port_tags(device_t &device, const char
// configuration addiitons
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(smpc_hle_device::device_add_mconfig)
+MACHINE_CONFIG_START(smpc_hle_device::device_add_mconfig)
MCFG_NVRAM_ADD_0FILL("smem")
// TODO: custom RTC subdevice
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index 4661e085716..7ef680e9f6c 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -326,7 +326,7 @@ void generic_terminal_device::kbd_put(u8 data)
VIDEO HARDWARE
***************************************************************************/
-MACHINE_CONFIG_MEMBER( generic_terminal_device::device_add_mconfig )
+MACHINE_CONFIG_START(generic_terminal_device::device_add_mconfig)
MCFG_SCREEN_ADD(TERMINAL_SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h
index b4ebc801a17..3632b7b8c47 100644
--- a/src/devices/machine/upd7002.h
+++ b/src/devices/machine/upd7002.h
@@ -100,9 +100,9 @@ DECLARE_DEVICE_TYPE(UPD7002, upd7002_device)
***************************************************************************/
#define MCFG_UPD7002_GET_ANALOGUE_CB(_class, _method) \
- upd7002_device::set_get_analogue_callback(*device, upd7002_device::get_analogue_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ upd7002_device::set_get_analogue_callback(*device, upd7002_device::get_analogue_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_UPD7002_EOC_CB(_class, _method) \
- upd7002_device::set_eoc_callback(*device, upd7002_device::eoc_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ upd7002_device::set_eoc_callback(*device, upd7002_device::eoc_delegate(&_class::_method, #_class "::" #_method, this));
#endif // MAME_MACHINE_UPD7002_H
diff --git a/src/devices/machine/vrc5074.cpp b/src/devices/machine/vrc5074.cpp
index 30df10a20f6..a603c24d4af 100644
--- a/src/devices/machine/vrc5074.cpp
+++ b/src/devices/machine/vrc5074.cpp
@@ -139,7 +139,7 @@ DEVICE_ADDRESS_MAP_START(target1_map, 32, vrc5074_device)
AM_RANGE(0x00000000, 0xFFFFFFFF) AM_READWRITE(target1_r, target1_w)
ADDRESS_MAP_END
-MACHINE_CONFIG_MEMBER(vrc5074_device::device_add_mconfig)
+MACHINE_CONFIG_START(vrc5074_device::device_add_mconfig)
MCFG_DEVICE_ADD("uart", NS16550, SYSTEM_CLOCK / 12)
MCFG_INS8250_OUT_INT_CB(WRITELINE(vrc5074_device, uart_irq_callback))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("ttys00", rs232_port_device, write_txd))
diff --git a/src/devices/machine/vrc5074.h b/src/devices/machine/vrc5074.h
index f5055cf8212..736f72f60fc 100644
--- a/src/devices/machine/vrc5074.h
+++ b/src/devices/machine/vrc5074.h
@@ -20,7 +20,7 @@
downcast<vrc5074_device *>(device)->set_sdram_size(_index, _size);
#define MCFG_VRC5074_SET_CS(_cs_num, _map) \
- downcast<vrc5074_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), owner);
+ downcast<vrc5074_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), this);
class vrc5074_device : public pci_host_device {
public:
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index ee2ed5bb195..05df6925045 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -21,7 +21,7 @@
DEFINE_DEVICE_TYPE(WD7600, wd7600_device, "wd7600", "Western Digital WD7600 chipset")
-MACHINE_CONFIG_MEMBER( wd7600_device::device_add_mconfig )
+MACHINE_CONFIG_START(wd7600_device::device_add_mconfig)
MCFG_DEVICE_ADD("dma1", AM9517A, 0)
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(wd7600_device, dma1_eop_w))
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 8e97ddfb1d3..7d996a4e77f 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -45,7 +45,7 @@ const tiny_rom_entry *wozfdc_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( wozfdc_device::device_add_mconfig )
+MACHINE_CONFIG_START(wozfdc_device::device_add_mconfig)
MCFG_DEVICE_ADD("phaselatch", F9334, 0) // 9334 on circuit diagram but 74LS259 in parts list; actual chip may vary
MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(wozfdc_device, set_phase))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp
index 8977c46032e..194e35bdb4a 100644
--- a/src/devices/machine/z80dart.cpp
+++ b/src/devices/machine/z80dart.cpp
@@ -59,7 +59,7 @@ DEFINE_DEVICE_TYPE(UPD7201, upd7201_device, "upd7201", "NEC uPD
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( z80dart_device::device_add_mconfig )
+MACHINE_CONFIG_START(z80dart_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, Z80DART_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, Z80DART_CHANNEL, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index af412fec149..6d1ad93e3c3 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -371,7 +371,7 @@ DEFINE_DEVICE_TYPE(SCC8523L, scc8523l_device, "scc8523l", "Zilog Z85
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( z80scc_device::device_add_mconfig )
+MACHINE_CONFIG_START(z80scc_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, Z80SCC_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, Z80SCC_CHANNEL, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index efe83ac2486..38db1a53e7b 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -242,12 +242,12 @@ DEFINE_DEVICE_TYPE(UPD7201_NEW, upd7201_new_device, "upd7201_new", "NEC uP
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( z80sio_device::device_add_mconfig )
+MACHINE_CONFIG_START(z80sio_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( i8274_new_device::device_add_mconfig )
+MACHINE_CONFIG_START(i8274_new_device::device_add_mconfig)
MCFG_DEVICE_ADD(CHANA_TAG, I8274_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, I8274_CHANNEL, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index 8f30b7def32..533b576a825 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -21,7 +21,7 @@ ad1848_device::ad1848_device(const machine_config &mconfig, const char *tag, dev
{
}
-MACHINE_CONFIG_MEMBER( ad1848_device::device_add_mconfig )
+MACHINE_CONFIG_START(ad1848_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp
index 612d1cd0dec..1d725e898ba 100644
--- a/src/devices/sound/bsmt2000.cpp
+++ b/src/devices/sound/bsmt2000.cpp
@@ -104,7 +104,7 @@ const tiny_rom_entry *bsmt2000_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( bsmt2000_device::device_add_mconfig )
+MACHINE_CONFIG_START(bsmt2000_device::device_add_mconfig)
MCFG_CPU_ADD("bsmt2000", TMS32015, DERIVED_CLOCK(1,1))
MCFG_CPU_PROGRAM_MAP(tms_program_map)
// data map is internal to the CPU
diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp
index 61d7765a93e..9fac6faeecb 100644
--- a/src/devices/sound/cdp1869.cpp
+++ b/src/devices/sound/cdp1869.cpp
@@ -358,7 +358,7 @@ cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *tag, d
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( cdp1869_device::device_add_mconfig )
+MACHINE_CONFIG_START(cdp1869_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 8+64)
MCFG_PALETTE_INIT_OWNER(cdp1869_device, cdp1869)
MACHINE_CONFIG_END
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index a41da2eb072..c0e2197318b 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -116,13 +116,13 @@
cdp1869_device::static_set_color_clock(*device, _clk);
#define MCFG_CDP1869_CHAR_RAM_READ_OWNER(_class, _method) \
- cdp1869_device::static_set_char_ram_read(*device, cdp1869_device::char_ram_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ cdp1869_device::static_set_char_ram_read(*device, cdp1869_device::char_ram_read_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(_class, _method) \
- cdp1869_device::static_set_char_ram_write(*device, cdp1869_device::char_ram_write_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ cdp1869_device::static_set_char_ram_write(*device, cdp1869_device::char_ram_write_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CDP1869_CHAR_PCB_READ_OWNER(_class, _method) \
- cdp1869_device::static_set_pcb_read(*device, cdp1869_device::pcb_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ cdp1869_device::static_set_pcb_read(*device, cdp1869_device::pcb_read_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
diff --git a/src/devices/sound/cem3394.h b/src/devices/sound/cem3394.h
index 2240534006d..63480d4dd8f 100644
--- a/src/devices/sound/cem3394.h
+++ b/src/devices/sound/cem3394.h
@@ -17,7 +17,7 @@
MCFG_DEVICE_REPLACE(_tag, CEM3394, _clock)
#define MCFG_CEM3394_EXT_INPUT_CB(_class, _method) \
- cem3394_device::set_ext_input_callback(*device, cem3394_device::ext_input_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ cem3394_device::set_ext_input_callback(*device, cem3394_device::ext_input_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CEM3394_VCO_ZERO(_freq) \
cem3394_device::set_vco_zero_freq(*device, _freq);
diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp
index b4dfbf18359..15c274aab76 100644
--- a/src/devices/sound/es1373.cpp
+++ b/src/devices/sound/es1373.cpp
@@ -71,7 +71,7 @@
#define ES_PCI_READ 0
#define ES_PCI_WRITE 1
-MACHINE_CONFIG_MEMBER( es1373_device::device_add_mconfig )
+MACHINE_CONFIG_START(es1373_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h
index d6a946cec73..c9225c6b1e6 100644
--- a/src/devices/sound/k054539.h
+++ b/src/devices/sound/k054539.h
@@ -14,7 +14,7 @@
#define K054539_CB_MEMBER(_name) void _name(double left, double right)
#define MCFG_K054539_APAN_CB(_class, _method) \
- k054539_device::set_analog_callback(*device, k054539_device::cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ k054539_device::set_analog_callback(*device, k054539_device::cb_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_K054539_REGION_OVERRRIDE(_region) \
k054539_device::set_override(*device, "^" _region);
diff --git a/src/devices/sound/lc7535.h b/src/devices/sound/lc7535.h
index 0ca10aa5a32..a43e354c5fa 100644
--- a/src/devices/sound/lc7535.h
+++ b/src/devices/sound/lc7535.h
@@ -38,7 +38,7 @@
devcb = &lc7535_device::set_select_callback(*device, DEVCB_##_read);
#define MCFG_LC7535_VOLUME_CB(_class, _method) \
- lc7535_device::set_volume_callback(*device, lc7535_device::volume_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ lc7535_device::set_volume_callback(*device, lc7535_device::volume_delegate(&_class::_method, #_class "::" #_method, this));
#define LC7535_VOLUME_CHANGED(name) void name(int attenuation_right, int attenuation_left, bool loudness)
diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
index 58688f9ee39..9e093ab252b 100644
--- a/src/devices/sound/pokey.h
+++ b/src/devices/sound/pokey.h
@@ -94,10 +94,10 @@
/* k543210 = k5 ... k0 returns bit0: kr1, bit1: kr2 */
/* all are, in contrast to actual hardware, ACTIVE_HIGH */
#define MCFG_POKEY_KEYBOARD_CB(_class, _method) \
- pokey_device::set_keyboard_callback(*device, pokey_device::kb_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ pokey_device::set_keyboard_callback(*device, pokey_device::kb_cb_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_POKEY_INTERRUPT_CB(_class, _method) \
- pokey_device::set_interrupt_callback(*device, pokey_device::int_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ pokey_device::set_interrupt_callback(*device, pokey_device::int_cb_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_POKEY_OUTPUT_RC(_R, _C, _V) \
diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp
index 64d64bef64a..77a1e25a29f 100644
--- a/src/devices/sound/qs1000.cpp
+++ b/src/devices/sound/qs1000.cpp
@@ -196,7 +196,7 @@ const tiny_rom_entry *qs1000_device::device_rom_region() const
//-------------------------------------------------
// device_add_mconfig - add machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( qs1000_device::device_add_mconfig )
+MACHINE_CONFIG_START(qs1000_device::device_add_mconfig)
MCFG_CPU_ADD("cpu", I8052, DERIVED_CLOCK(1, 1))
MCFG_CPU_PROGRAM_MAP(qs1000_prg_map)
MCFG_CPU_IO_MAP(qs1000_io_map)
diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp
index 78840603199..6f9fcc3a017 100644
--- a/src/devices/sound/qsound.cpp
+++ b/src/devices/sound/qsound.cpp
@@ -97,7 +97,7 @@ const tiny_rom_entry *qsound_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( qsound_device::device_add_mconfig )
+MACHINE_CONFIG_START(qsound_device::device_add_mconfig)
MCFG_CPU_ADD("qsound", DSP16, QSOUND_CLOCK)
MCFG_CPU_PROGRAM_MAP(dsp16_program_map)
MCFG_CPU_DATA_MAP(dsp16_data_map)
diff --git a/src/devices/sound/rf5c68.h b/src/devices/sound/rf5c68.h
index 2354f874209..a841ae44e84 100644
--- a/src/devices/sound/rf5c68.h
+++ b/src/devices/sound/rf5c68.h
@@ -20,7 +20,7 @@
MCFG_DEVICE_REPLACE(_tag, RF5C68, _clock)
#define MCFG_RF5C68_SAMPLE_END_CB(_class, _method) \
- rf5c68_device::set_end_callback(*device, rf5c68_device::sample_end_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ rf5c68_device::set_end_callback(*device, rf5c68_device::sample_end_cb_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index 7b0c4cc3446..d6c56546928 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -36,7 +36,7 @@ DECLARE_DEVICE_TYPE(SAMPLES, samples_device)
#define SAMPLES_START_CB_MEMBER(_name) void _name()
#define MCFG_SAMPLES_START_CB(_class, _method) \
- samples_device::set_samples_start_callback(*device, samples_device::start_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ samples_device::set_samples_start_callback(*device, samples_device::start_cb_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp
index 3425cd9875f..b773dcab8e3 100644
--- a/src/devices/video/315_5124.cpp
+++ b/src/devices/video/315_5124.cpp
@@ -1698,7 +1698,7 @@ void sega315_5124_device::device_reset()
// device_add_mconfig - add machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sega315_5124_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega315_5124_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", SEGA315_5124_PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(sega315_5124_device, sega315_5124)
MACHINE_CONFIG_END
@@ -1713,7 +1713,7 @@ void sega315_5378_device::device_reset()
// device_add_mconfig - add machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( sega315_5378_device::device_add_mconfig )
+MACHINE_CONFIG_START(sega315_5378_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", SEGA315_5378_PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(sega315_5378_device, sega315_5378)
MACHINE_CONFIG_END
diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp
index 12737fe9192..f5b6b7c689f 100644
--- a/src/devices/video/315_5313.cpp
+++ b/src/devices/video/315_5313.cpp
@@ -183,7 +183,7 @@ void sega315_5313_device::static_set_palette_tag(device_t &device, const char *t
// add machine configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(sega315_5313_device::device_add_mconfig)
+MACHINE_CONFIG_START(sega315_5313_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_PALETTE_INIT_OWNER(sega315_5124_device, sega315_5124)
MACHINE_CONFIG_END
diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h
index 86f47b3bfaf..be71b90dd6b 100644
--- a/src/devices/video/315_5313.h
+++ b/src/devices/video/315_5313.h
@@ -41,13 +41,13 @@
// Temporary solution while 32x VDP mixing and scanline interrupting is moved outside MD VDP
#define MCFG_SEGA315_5313_32X_SCANLINE_CB(_class, _method) \
- sega315_5313_device::set_md_32x_scanline(*device, sega315_5313_device::md_32x_scanline_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sega315_5313_device::set_md_32x_scanline(*device, sega315_5313_device::md_32x_scanline_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_SEGA315_5313_32X_INTERRUPT_CB(_class, _method) \
- sega315_5313_device::set_md_32x_interrupt(*device, sega315_5313_device::md_32x_interrupt_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sega315_5313_device::set_md_32x_interrupt(*device, sega315_5313_device::md_32x_interrupt_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_SEGA315_5313_32X_SCANLINE_HELPER_CB(_class, _method) \
- sega315_5313_device::set_md_32x_scanline_helper(*device, sega315_5313_device::md_32x_scanline_helper_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ sega315_5313_device::set_md_32x_scanline_helper(*device, sega315_5313_device::md_32x_scanline_helper_delegate(&_class::_method, #_class "::" #_method, this));
class sega315_5313_device : public sega315_5124_device
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index b1f114405c7..402e253b1ca 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -60,24 +60,6 @@ cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const
{
}
-MACHINE_CONFIG_START( pcvideo_cirrus_gd5428 )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0)
-MACHINE_CONFIG_END
-
-MACHINE_CONFIG_START( pcvideo_cirrus_gd5430 )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", CIRRUS_GD5430, 0)
-MACHINE_CONFIG_END
-
void cirrus_gd5428_device::device_start()
{
zero();
diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h
index 9bfffe8a15e..a6bad5716ec 100644
--- a/src/devices/video/clgd542x.h
+++ b/src/devices/video/clgd542x.h
@@ -12,9 +12,6 @@
#include "video/pc_vga.h"
-MACHINE_CONFIG_EXTERN( pcvideo_cirrus_gd5428 );
-MACHINE_CONFIG_EXTERN( pcvideo_cirrus_gd5430 );
-
class cirrus_gd5428_device : public svga_device
{
public:
@@ -91,6 +88,9 @@ protected:
inline uint8_t cirrus_vga_latch_write(int offs, uint8_t data);
+ void pcvideo_cirrus_gd5428(machine_config &config);
+ void pcvideo_cirrus_gd5430(machine_config &config);
+
private:
void cirrus_define_video_mode();
uint8_t cirrus_seq_reg_read(uint8_t index);
diff --git a/src/devices/video/crt9021.h b/src/devices/video/crt9021.h
index 2a0b3620c4d..e1e6600c9fe 100644
--- a/src/devices/video/crt9021.h
+++ b/src/devices/video/crt9021.h
@@ -39,7 +39,7 @@
#define MCFG_CRT9021_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \
- crt9021_device::static_set_display_callback(*device, crt9021_device::draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ crt9021_device::static_set_display_callback(*device, crt9021_device::draw_character_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h
index cd30ba53f33..7d442d8dd7f 100644
--- a/src/devices/video/crtc_ega.h
+++ b/src/devices/video/crtc_ega.h
@@ -21,13 +21,13 @@
#define MCFG_CRTC_EGA_SET_SCREEN MCFG_VIDEO_SET_SCREEN
#define MCFG_CRTC_EGA_BEGIN_UPDATE_CB(_class, _method) \
- crtc_ega_device::set_begin_update_callback(*device, crtc_ega_device::begin_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ crtc_ega_device::set_begin_update_callback(*device, crtc_ega_device::begin_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CRTC_EGA_ROW_UPDATE_CB(_class, _method) \
- crtc_ega_device::set_row_update_callback(*device, crtc_ega_device::row_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ crtc_ega_device::set_row_update_callback(*device, crtc_ega_device::row_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CRTC_EGA_END_UPDATE_CB(_class, _method) \
- crtc_ega_device::set_end_update_callback(*device, crtc_ega_device::end_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ crtc_ega_device::set_end_update_callback(*device, crtc_ega_device::end_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_CRTC_EGA_HPIXELS_PER_COLUMN(_pix) \
crtc_ega_device::set_hpixels_per_column(*device, _pix);
diff --git a/src/devices/video/ef9369.h b/src/devices/video/ef9369.h
index b25a892a662..ee7317f7975 100644
--- a/src/devices/video/ef9369.h
+++ b/src/devices/video/ef9369.h
@@ -39,7 +39,7 @@
MCFG_DEVICE_ADD(_tag, EF9369, 0) \
#define MCFG_EF9369_COLOR_UPDATE_CB(_class, _method) \
- ef9369_device::set_color_update_callback(*device, ef9369_device::color_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ ef9369_device::set_color_update_callback(*device, ef9369_device::color_update_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp
index 53b2bca2124..6176a51a54a 100644
--- a/src/devices/video/gba_lcd.cpp
+++ b/src/devices/video/gba_lcd.cpp
@@ -1804,7 +1804,7 @@ void gba_lcd_device::device_reset()
m_hbl_timer->adjust(attotime::never);
}
-MACHINE_CONFIG_MEMBER(gba_lcd_device::device_add_mconfig)
+MACHINE_CONFIG_START(gba_lcd_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_RAW_PARAMS(XTAL_16_777216MHz / 4, 308, 0, 240, 228, 0, 160)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, gba_lcd_device, screen_update)
diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h
index f56f286ce13..c2508704627 100644
--- a/src/devices/video/hd44780.h
+++ b/src/devices/video/hd44780.h
@@ -22,7 +22,7 @@
hd44780_device::static_set_lcd_size(*device, _lines, _chars);
#define MCFG_HD44780_PIXEL_UPDATE_CB(_class, _method) \
- hd44780_device::static_set_pixel_update_cb(*device, hd44780_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ hd44780_device::static_set_pixel_update_cb(*device, hd44780_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h
index 3c228b512e0..58ab2f35257 100644
--- a/src/devices/video/hd63484.h
+++ b/src/devices/video/hd63484.h
@@ -26,7 +26,7 @@
MCFG_DEVICE_ADDRESS_MAP(0, _map)
#define MCFG_HD63484_DISPLAY_CALLBACK_OWNER(_class, _method) \
- hd63484_device::static_set_display_callback(*device, hd63484_device::display_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ hd63484_device::static_set_display_callback(*device, hd63484_device::display_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_HD63484_AUTO_CONFIGURE_SCREEN(_val) \
hd63484_device::static_set_auto_configure_screen(*device, _val);
diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp
index 2a22f4732e5..3de7355d5f6 100644
--- a/src/devices/video/hd66421.cpp
+++ b/src/devices/video/hd66421.cpp
@@ -280,7 +280,7 @@ PALETTE_INIT_MEMBER(hd66421_device, hd66421)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( hd66421_device::device_add_mconfig )
+MACHINE_CONFIG_START(hd66421_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 4)
MCFG_PALETTE_INIT_OWNER(hd66421_device, hd66421)
MACHINE_CONFIG_END
diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp
index ee2943896dd..a86c3980d2e 100644
--- a/src/devices/video/huc6260.cpp
+++ b/src/devices/video/huc6260.cpp
@@ -303,7 +303,7 @@ void huc6260_device::device_reset()
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( huc6260_device::device_add_mconfig )
+MACHINE_CONFIG_START(huc6260_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", huc6260_device::PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(huc6260_device, huc6260)
MACHINE_CONFIG_END
diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp
index b817490e0f3..0d3360090ee 100644
--- a/src/devices/video/huc6272.cpp
+++ b/src/devices/video/huc6272.cpp
@@ -381,7 +381,7 @@ WRITE32_MEMBER( huc6272_device::write )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( huc6272_device::device_add_mconfig )
+MACHINE_CONFIG_START(huc6272_device::device_add_mconfig)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSI_RST_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h
index f9de659e825..38319d9b3c4 100644
--- a/src/devices/video/i82730.h
+++ b/src/devices/video/i82730.h
@@ -21,13 +21,13 @@
#define MCFG_I82730_ADD(_tag, _cpu_tag, _clock) \
MCFG_DEVICE_ADD(_tag, I82730, _clock) \
- i82730_device::set_cpu_tag(*device, owner, _cpu_tag);
+ i82730_device::set_cpu_tag(*device, this, _cpu_tag);
#define MCFG_I82730_SINT_HANDLER(_devcb) \
devcb = &i82730_device::set_sint_handler(*device, DEVCB_##_devcb);
#define MCFG_I82730_UPDATE_ROW_CB(_class, _method) \
- i82730_device::set_update_row_callback(*device, i82730_device::update_row_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ i82730_device::set_update_row_callback(*device, i82730_device::update_row_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h
index edb2e43e855..06a6495698d 100644
--- a/src/devices/video/i8275.h
+++ b/src/devices/video/i8275.h
@@ -48,7 +48,7 @@
i8275_device::static_set_character_width(*device, _value);
#define MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \
- i8275_device::static_set_display_callback(*device, i8275_device::draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ i8275_device::static_set_display_callback(*device, i8275_device::draw_character_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_I8275_DRQ_CALLBACK(_write) \
devcb = &i8275_device::set_drq_wr_callback(*device, DEVCB_##_write);
diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp
index 40774f7c9ba..6371db37e84 100644
--- a/src/devices/video/imagetek_i4100.cpp
+++ b/src/devices/video/imagetek_i4100.cpp
@@ -246,7 +246,7 @@ imagetek_i4300_device::imagetek_i4300_device(const machine_config &mconfig, cons
// configuration addiitons
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER(imagetek_i4100_device::device_add_mconfig)
+MACHINE_CONFIG_START(imagetek_i4100_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_PALETTE_FORMAT(GGGGGRRRRRBBBBBx)
MACHINE_CONFIG_END
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index 909f068f687..dfddcdfedb2 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -1524,7 +1524,7 @@ mos8568_device::mos8568_device(const machine_config &mconfig, const char *tag, d
}
-MACHINE_CONFIG_MEMBER(mos8563_device::device_add_mconfig)
+MACHINE_CONFIG_START(mos8563_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(mos8563_device, mos8563)
MACHINE_CONFIG_END
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index e30cc081535..dd407da06eb 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -37,19 +37,19 @@
mc6845_device::set_char_width(*device, _pixels);
#define MCFG_MC6845_RECONFIGURE_CB(_class, _method) \
- mc6845_device::set_reconfigure_callback(*device, mc6845_device::reconfigure_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6845_device::set_reconfigure_callback(*device, mc6845_device::reconfigure_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6845_BEGIN_UPDATE_CB(_class, _method) \
- mc6845_device::set_begin_update_callback(*device, mc6845_device::begin_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6845_device::set_begin_update_callback(*device, mc6845_device::begin_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6845_UPDATE_ROW_CB(_class, _method) \
- mc6845_device::set_update_row_callback(*device, mc6845_device::update_row_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6845_device::set_update_row_callback(*device, mc6845_device::update_row_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6845_END_UPDATE_CB(_class, _method) \
- mc6845_device::set_end_update_callback(*device, mc6845_device::end_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6845_device::set_end_update_callback(*device, mc6845_device::end_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6845_ADDR_CHANGED_CB(_class, _method) \
- mc6845_device::set_on_update_addr_change_callback(*device, mc6845_device::on_update_addr_changed_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6845_device::set_on_update_addr_change_callback(*device, mc6845_device::on_update_addr_changed_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6845_OUT_DE_CB(_write) \
devcb = &mc6845_device::set_out_de_callback(*device, DEVCB_##_write);
diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h
index 4b3838242c3..1d1c086012f 100644
--- a/src/devices/video/mc6847.h
+++ b/src/devices/video/mc6847.h
@@ -42,7 +42,7 @@
devcb = &mc6847_friend_device::set_fsync_wr_callback(*device, DEVCB_##_write);
#define MCFG_MC6847_CHARROM_CALLBACK(_class, _method) \
- mc6847_friend_device::set_get_char_rom(*device, mc6847_friend_device::get_char_rom_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ mc6847_friend_device::set_get_char_rom(*device, mc6847_friend_device::get_char_rom_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_MC6847_INPUT_CALLBACK(_read) \
devcb = &mc6847_base_device::set_input_callback(*device, DEVCB_##_read);
diff --git a/src/devices/video/nt7534.h b/src/devices/video/nt7534.h
index 198e6291157..f281be2c15e 100644
--- a/src/devices/video/nt7534.h
+++ b/src/devices/video/nt7534.h
@@ -16,7 +16,7 @@
MCFG_DEVICE_ADD( _tag, NT7534, 0 )
#define MCFG_NT7534_PIXEL_UPDATE_CB(_class, _method) \
- nt7534_device::static_set_pixel_update_cb(*device, nt7534_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ nt7534_device::static_set_pixel_update_cb(*device, nt7534_device::pixel_update_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 5bff9734440..9e8dd3c9964 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -2219,53 +2219,17 @@ WRITE8_MEMBER(vga_device::mem_linear_w)
vga.memory[offset % vga.svga_intf.vram_size] = data;
}
-MACHINE_CONFIG_START( pcvideo_vga )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", VGA, 0)
-MACHINE_CONFIG_END
-
-MACHINE_CONFIG_START( pcvideo_trident_vga )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0)
-MACHINE_CONFIG_END
-
-MACHINE_CONFIG_START( pcvideo_gamtor_vga )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", gamtor_vga_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", GAMTOR_VGA, 0)
-MACHINE_CONFIG_END
-
-MACHINE_CONFIG_START( pcvideo_s3_vga )
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
- MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update)
-
- MCFG_PALETTE_ADD("palette", 0x100)
- MCFG_DEVICE_ADD("vga", S3_VGA, 0)
-MACHINE_CONFIG_END
-
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( ati_vga_device::device_add_mconfig )
+MACHINE_CONFIG_START(ati_vga_device::device_add_mconfig)
MCFG_MACH8_ADD_OWNER("8514a")
MCFG_EEPROM_SERIAL_93C46_ADD("ati_eeprom")
MACHINE_CONFIG_END
-MACHINE_CONFIG_MEMBER( s3_vga_device::device_add_mconfig )
+MACHINE_CONFIG_START(s3_vga_device::device_add_mconfig)
MCFG_8514A_ADD_OWNER("8514a")
MACHINE_CONFIG_END
diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h
index 0b5b9539fd9..33db42987b7 100644
--- a/src/devices/video/pc_vga.h
+++ b/src/devices/video/pc_vga.h
@@ -13,11 +13,6 @@
#include "screen.h"
-MACHINE_CONFIG_EXTERN( pcvideo_vga );
-MACHINE_CONFIG_EXTERN( pcvideo_trident_vga );
-MACHINE_CONFIG_EXTERN( pcvideo_gamtor_vga );
-MACHINE_CONFIG_EXTERN( pcvideo_s3_vga );
-
// ======================> vga_device
class vga_device : public device_t
diff --git a/src/devices/video/pcd8544.h b/src/devices/video/pcd8544.h
index 8a5c71e6e95..850e9996df1 100644
--- a/src/devices/video/pcd8544.h
+++ b/src/devices/video/pcd8544.h
@@ -22,7 +22,7 @@
MCFG_DEVICE_ADD( _tag, PCD8544, 0 )
#define MCFG_PCD8544_SCREEN_UPDATE_CALLBACK(_class, _method) \
- pcd8544_device::static_set_screen_update_cb(*device, pcd8544_device::screen_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ pcd8544_device::static_set_screen_update_cb(*device, pcd8544_device::screen_update_delegate(&_class::_method, #_class "::" #_method, this));
// ======================> pcd8544_device
diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp
index 33e633c61d7..69c0440c037 100644
--- a/src/devices/video/psx.cpp
+++ b/src/devices/video/psx.cpp
@@ -3804,14 +3804,14 @@ PALETTE_INIT_MEMBER( psxgpu_device, psx )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( psxgpu_device::device_add_mconfig )
+MACHINE_CONFIG_START(psxgpu_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( 60 )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MCFG_SCREEN_SIZE( 1024, 1024 )
MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, psxgpu_device, update_screen )
- ((screen_device *)device)->register_vblank_callback(vblank_state_delegate(&psxgpu_device::vblank, (psxgpu_device *) owner));
+ ((screen_device *)device)->register_vblank_callback(vblank_state_delegate(&psxgpu_device::vblank, this));
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD( "palette", 65536 )
diff --git a/src/devices/video/scn2674.h b/src/devices/video/scn2674.h
index 7e110430671..96dc50c2fec 100644
--- a/src/devices/video/scn2674.h
+++ b/src/devices/video/scn2674.h
@@ -16,7 +16,7 @@
scn2674_device::static_set_gfx_character_width(*device, _value);
#define MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \
- scn2674_device::static_set_display_callback(*device, scn2674_device::draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ scn2674_device::static_set_display_callback(*device, scn2674_device::draw_character_delegate(&_class::_method, #_class "::" #_method, this));
#define SCN2674_DRAW_CHARACTER_MEMBER(_name) void _name(bitmap_rgb32 &bitmap, int x, int y, uint8_t linecount, uint8_t charcode, uint16_t address, uint8_t cursor, uint8_t dw, uint8_t lg, uint8_t ul, uint8_t blink)
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h
index a8e9b8e8b97..3ae9b31db7f 100644
--- a/src/devices/video/upd3301.h
+++ b/src/devices/video/upd3301.h
@@ -47,7 +47,7 @@
upd3301_device::static_set_character_width(*device, _value);
#define MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \
- upd3301_device::static_set_display_callback(*device, upd3301_device::draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ upd3301_device::static_set_display_callback(*device, upd3301_device::draw_character_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_UPD3301_DRQ_CALLBACK(_write) \
devcb = &upd3301_device::set_drq_wr_callback(*device, DEVCB_##_write);
diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h
index 75c3b2f7faa..1f8eab72a07 100644
--- a/src/devices/video/upd7220.h
+++ b/src/devices/video/upd7220.h
@@ -45,10 +45,10 @@
#define MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(_class, _method) \
- upd7220_device::static_set_display_pixels_callback(*device, upd7220_device::display_pixels_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ upd7220_device::static_set_display_pixels_callback(*device, upd7220_device::display_pixels_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(_class, _method) \
- upd7220_device::static_set_draw_text_callback(*device, upd7220_device::draw_text_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ upd7220_device::static_set_draw_text_callback(*device, upd7220_device::draw_text_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_UPD7220_DRQ_CALLBACK(_write) \
devcb = &upd7220_device::set_drq_wr_callback(*device, DEVCB_##_write);
diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp
index efec0d795a6..534e78eecc1 100644
--- a/src/devices/video/vic4567.cpp
+++ b/src/devices/video/vic4567.cpp
@@ -2046,6 +2046,6 @@ uint32_t vic3_device::video_update( bitmap_ind16 &bitmap, const rectangle &clipr
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_MEMBER( vic3_device::device_add_mconfig )
+MACHINE_CONFIG_START(vic3_device::device_add_mconfig)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x100)
MACHINE_CONFIG_END
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index cb7bdc81884..e6a19ccfbb0 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -8,7 +8,7 @@
int voodoo_pci_device::m_type = 0;
-MACHINE_CONFIG_MEMBER(voodoo_pci_device::device_add_mconfig)
+MACHINE_CONFIG_START(voodoo_pci_device::device_add_mconfig)
switch (m_type) {
case TYPE_VOODOO_1:
MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK)